Commit 6e80ac5c authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <ben@decadent.org.uk>
Acked-by: default avatarCraig Gallek <kraig@google.com>
Signed-off-by: default avatarDavid 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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE