Commit 02ca0423 authored Jan 13, 2017 by Jakub Sitnicki Committed by David S. Miller Jan 16, 2017

ip6_tunnel: Account for tunnel header in tunnel MTU



With ip6gre we have a tunnel header which also makes the tunnel MTU
smaller. We need to reserve room for it. Previously we were using up
space reserved for the Tunnel Encapsulation Limit option
header (RFC 2473).

Also, after commit b05229f4 ("gre6: Cleanup GREv6 transmit path,
call common GRE functions") our contract with the caller has
changed. Now we check if the packet length exceeds the tunnel MTU after
the tunnel header has been pushed, unlike before.

This is reflected in the check where we look at the packet length minus
the size of the tunnel header, which is already accounted for in tunnel
MTU.

Fixes: b05229f4 ("gre6: Cleanup GREv6 transmit path, call common GRE functions")
Signed-off-by: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1666d49e

net/ipv6/ip6_tunnel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1108,7 +1108,7 @@ route_lookup:
		t->parms.name);
		goto tx_err_dst_release;
		}
		mtu = dst_mtu(dst) - psh_hlen;
		mtu = dst_mtu(dst) - psh_hlen - t->tun_hlen;
		if (encap_limit >= 0) {
		max_headroom += 8;
		mtu -= 8;
		@@ -1117,7 +1117,7 @@ route_lookup:
		mtu = IPV6_MIN_MTU;
		if (skb_dst(skb) && !t->parms.collect_md)
		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
		if (skb->len > mtu && !skb_is_gso(skb)) {
		if (skb->len - t->tun_hlen > mtu && !skb_is_gso(skb)) {
		*pmtu = mtu;
		err = -EMSGSIZE;
		goto tx_err_dst_release;

Admin message