diff options
| author | Eli Cooper <elicooper@gmx.com> | 2016-11-01 23:45:12 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-21 10:06:39 +0100 |
| commit | 8777977b22c47c47873bdf9e88aa20cc701257bd (patch) | |
| tree | cb79c71c12919ecefe504c41a2f87c7b15c528b6 /include/net | |
| parent | c5bad811ca4d4bb5ad1fc44bed4f77efd831878e (diff) | |
| download | linux-stable-8777977b22c47c47873bdf9e88aa20cc701257bd.tar.gz linux-stable-8777977b22c47c47873bdf9e88aa20cc701257bd.tar.bz2 linux-stable-8777977b22c47c47873bdf9e88aa20cc701257bd.zip | |
ip6_tunnel: Clear IP6CB in ip6tunnel_xmit()
[ Upstream commit 23f4ffedb7d751c7e298732ba91ca75d224bc1a6 ]
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip6_tunnel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index ff788b665277..9c2c044153f6 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -86,6 +86,7 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, struct net_device_stats *stats = &dev->stats; int pkt_len, err; + memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); pkt_len = skb->len - skb_inner_network_offset(skb); err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb); |