diff options
| author | Yohei Kanemaru | 2019-01-29 07:52:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-06 17:30:06 +0100 |
| commit | 2f704348c93ff8119e642dae6a72327f90b82810 (patch) | |
| tree | 5f102726daccae32e59a7daf3fadaafa259d9c55 /net/ipv6 | |
| parent | ipv6: Consider sk_bound_dev_if when binding a socket to an address (diff) | |
| download | kernel-qcow2-linux-2f704348c93ff8119e642dae6a72327f90b82810.tar.gz kernel-qcow2-linux-2f704348c93ff8119e642dae6a72327f90b82810.tar.xz kernel-qcow2-linux-2f704348c93ff8119e642dae6a72327f90b82810.zip | |
ipv6: sr: clear IP6CB(skb) on SRH ip4ip6 encapsulation
[ Upstream commit ef489749aae508e6f17886775c075f12ff919fb1 ]
skb->cb may contain data from previous layers (in an observed case
IPv4 with L3 Master Device). In the observed scenario, the data in
IPCB(skb)->frags was misinterpreted as IP6CB(skb)->frag_max_size,
eventually caused an unexpected IPv6 fragmentation in ip6_fragment()
through ip6_finish_output().
This patch clears IP6CB(skb), which potentially contains garbage data,
on the SRH ip4ip6 encapsulation.
Fixes: 32d99d0b6702 ("ipv6: sr: add support for ip4ip6 encapsulation")
Signed-off-by: Yohei Kanemaru <yohei.kanemaru@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/seg6_iptunnel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c index 8181ee7e1e27..ee5403cbe655 100644 --- a/net/ipv6/seg6_iptunnel.c +++ b/net/ipv6/seg6_iptunnel.c @@ -146,6 +146,8 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto) } else { ip6_flow_hdr(hdr, 0, flowlabel); hdr->hop_limit = ip6_dst_hoplimit(skb_dst(skb)); + + memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); } hdr->nexthdr = NEXTHDR_ROUTING; |