Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 599d0432 authored by Timo Teräs's avatar Timo Teräs Committed by Sasha Levin
Browse files

ip_tunnel: fix ipv4 pmtu check to honor inner ip header df 



[ Upstream commit fc24f2b2094366da8786f59f2606307e934cea17 ]

Frag needed should be sent only if the inner header asked
to not fragment. Currently fragmentation is broken if the
tunnel has df set, but df was not asked in the original
packet. The tunnel's df needs to be still checked to update
internally the pmtu cache.

Commit 23a3647b broke it, and this commit fixes
the ipv4 df check back to the way it was.

Fixes: 23a3647b ("ip_tunnels: Use skb-len to PMTU check.")
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarTimo Teräs <timo.teras@iki.fi>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent cb95bed6

net/ipv4/ip_tunnel.c

+5 −3
Original line number Diff line number Diff line
@@ -587,7 +587,8 @@ int ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t, 
EXPORT_SYMBOL(ip_tunnel_encap);



static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,

			    struct rtable *rt, __be16 df)

			    struct rtable *rt, __be16 df,

			    const struct iphdr *inner_iph)

{

	struct ip_tunnel *tunnel = netdev_priv(dev);

	int pkt_size = skb->len - tunnel->hlen - dev->hard_header_len;
@@ -604,7 +605,8 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb, 


	if (skb->protocol == htons(ETH_P_IP)) {

		if (!skb_is_gso(skb) &&

		    (df & htons(IP_DF)) && mtu < pkt_size) {

		    (inner_iph->frag_off & htons(IP_DF)) &&

		    mtu < pkt_size) {

			memset(IPCB(skb), 0, sizeof(*IPCB(skb)));

			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));

			return -E2BIG;
@@ -738,7 +740,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, 
		goto tx_error;

	}



	if (tnl_update_pmtu(dev, skb, rt, tnl_params->frag_off)) {

	if (tnl_update_pmtu(dev, skb, rt, tnl_params->frag_off, inner_iph)) {

		ip_rt_put(rt);

		goto tx_error;

	}