Commit ef489749 authored Jan 29, 2019 by Yohei Kanemaru Committed by David S. Miller Jan 30, 2019

ipv6: sr: clear IP6CB(skb) on SRH ip4ip6 encapsulation



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: 32d99d0b ("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>

parent a10cc847

net/ipv6/seg6_iptunnel.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;