lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 65/92] nsh: set mac len based on inner packet
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Willem de Bruijn <willemb@google.com>

    commit bab2c80e5a6c855657482eac9e97f5f3eedb509a upstream.

    When pulling the NSH header in nsh_gso_segment, set the mac length
    based on the encapsulated packet type.

    skb_reset_mac_len computes an offset to the network header, which
    here still points to the outer packet:

    > skb_reset_network_header(skb);
    > [...]
    > __skb_pull(skb, nsh_len);
    > skb_reset_mac_header(skb); // now mac hdr starts nsh_len == 8B after net hdr
    > skb_reset_mac_len(skb); // mac len = net hdr - mac hdr == (u16) -8 == 65528
    > [..]
    > skb_mac_gso_segment(skb, ..)

    Link: http://lkml.kernel.org/r/CAF=yD-KeAcTSOn4AxirAxL8m7QAS8GBBe1w09eziYwvPbbUeYA@mail.gmail.com
    Reported-by: syzbot+7b9ed9872dab8c32305d@syzkaller.appspotmail.com
    Fixes: c411ed854584 ("nsh: add GSO support")
    Signed-off-by: Willem de Bruijn <willemb@google.com>
    Acked-by: Jiri Benc <jbenc@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/nsh/nsh.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/nsh/nsh.c
    +++ b/net/nsh/nsh.c
    @@ -42,7 +42,7 @@ static struct sk_buff *nsh_gso_segment(s
    __skb_pull(skb, nsh_len);

    skb_reset_mac_header(skb);
    - skb_reset_mac_len(skb);
    + skb->mac_len = proto == htons(ETH_P_TEB) ? ETH_HLEN : 0;
    skb->protocol = proto;

    features &= NETIF_F_SG;

    \
     
     \ /
      Last update: 2018-07-20 14:52    [W:6.596 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site