diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-05-31 13:15:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-02 13:57:27 -0400 |
| commit | 6e80ac5cc992ab6256c3dae87f7e57db15e1a58c (patch) | |
| tree | ab042c99dd3349f1cf7d8af7dd585db670d6ff58 | |
| parent | 13fb6c2c7fe10ce39a5549c268e35341d83f2b3d (diff) | |
| download | op-kernel-dev-6e80ac5cc992ab6256c3dae87f7e57db15e1a58c.zip op-kernel-dev-6e80ac5cc992ab6256c3dae87f7e57db15e1a58c.tar.gz | |
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: 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>
| -rw-r--r-- | net/ipv6/xfrm6_mode_ro.c | 2 | ||||
| -rw-r--r-- | net/ipv6/xfrm6_mode_transport.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c index 0e01590..07d3657 100644 --- a/net/ipv6/xfrm6_mode_ro.c +++ b/net/ipv6/xfrm6_mode_ro.c @@ -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; diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c index 7a92c0f..9ad07a9 100644 --- a/net/ipv6/xfrm6_mode_transport.c +++ b/net/ipv6/xfrm6_mode_transport.c @@ -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; |
