aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Cooper <elicooper@gmx.com>2016-11-01 23:45:12 +0800
committerMister Oyster <oysterized@gmail.com>2017-04-11 10:58:36 +0200
commitf5d252e8164ea45c46e2e3a7c498d8cc78b7c1f8 (patch)
treecda489dd0e546e5029e166b772992b5bc6d0212c
parenteea081155f58317dd1b392d06fa729d80c4d0ea8 (diff)
ip6_tunnel: Clear IP6CB in ip6tunnel_xmit()
commit 23f4ffedb7d751c7e298732ba91ca75d224bc1a6 upstream. skb->cb may contain data from previous layers. In the observed scenario, the garbage data were misinterpreted as IP6CB(skb)->frag_max_size, so that small packets sent through the tunnel are mistakenly fragmented. This patch unconditionally clears the control buffer in ip6tunnel_xmit(), which affects ip6_tunnel, ip6_udp_tunnel and ip6_gre. Currently none of these tunnels set IP6CB(skb)->flags, otherwise it needs to be done earlier. Cc: stable@vger.kernel.org Signed-off-by: Eli Cooper <elicooper@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--include/net/ip6_tunnel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 4da5de10d..b140c6079 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -75,6 +75,7 @@ static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
int pkt_len, err;
nf_reset(skb);
+ memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
pkt_len = skb->len;
err = ip6_local_out(skb);