lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 003/119] ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Hutchings <ben@decadent.org.uk>


    [ Upstream commit 6e80ac5cc992ab6256c3dae87f7e57db15e1a58c ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/xfrm6_mode_ro.c | 2 ++
    net/ipv6/xfrm6_mode_transport.c | 2 ++
    2 files changed, 4 insertions(+)

    --- 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_s
    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;
    --- a/net/ipv6/xfrm6_mode_transport.c
    +++ b/net/ipv6/xfrm6_mode_transport.c
    @@ -28,6 +28,8 @@ static int xfrm6_transport_output(struct
    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;

    \
     
     \ /
      Last update: 2017-06-12 17:35    [W:4.019 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site