ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Fixes: 2423496af35d ("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>

authored by

Ben Hutchings and committed by

David S. Miller 8 years ago 6e80ac5c 13fb6c2c

2 changed files

expand all

net

ipv6

xfrm6_mode_ro.c

xfrm6_mode_transport.c

net/ipv6/xfrm6_mode_ro.c

··· 47 47 iph = ipv6_hdr(skb); 48 48 49 49 hdr_len = x->type->hdr_offset(x, skb, &prevhdr); 50 + if (hdr_len < 0) 51 + return hdr_len; 50 52 skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data); 51 53 skb_set_network_header(skb, -x->props.header_len); 52 54 skb->transport_header = skb->network_header + hdr_len;

net/ipv6/xfrm6_mode_transport.c

··· 30 30 skb_set_inner_transport_header(skb, skb_transport_offset(skb)); 31 31 32 32 hdr_len = x->type->hdr_offset(x, skb, &prevhdr); 33 + if (hdr_len < 0) 34 + return hdr_len; 33 35 skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data); 34 36 skb_set_network_header(skb, -x->props.header_len); 35 37 skb->transport_header = skb->network_header + hdr_len;