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

Commit 6e80ac5c authored May 31, 2017 by Ben Hutchings Committed by David S. Miller Jun 02, 2017

ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()



xfrm6_find_1stfragopt() may now return an error code and we must
not treat it as a length.

Fixes: 2423496a ("ipv6: Prevent overrun when parsing v6 header options")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Craig Gallek <kraig@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 13fb6c2c

net/ipv6/xfrm6_mode_ro.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ static int xfrm6_ro_output(struct xfrm_state x, struct sk_buff skb)
		iph = ipv6_hdr(skb);

		hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
		if (hdr_len < 0)
		return hdr_len;
		skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
		skb_set_network_header(skb, -x->props.header_len);
		skb->transport_header = skb->network_header + hdr_len;

net/ipv6/xfrm6_mode_transport.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ static int xfrm6_transport_output(struct xfrm_state x, struct sk_buff skb)
		skb_set_inner_transport_header(skb, skb_transport_offset(skb));

		hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
		if (hdr_len < 0)
		return hdr_len;
		skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
		skb_set_network_header(skb, -x->props.header_len);
		skb->transport_header = skb->network_header + hdr_len;