From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH net] nsh: set mac len based on inner packet
Date: Thu, 12 Jul 2018 16:57:08 -0700 (PDT)
Message-ID: <20180712.165708.1114334379843699345.davem@davemloft.net>
References: <20180711160046.198091-1-willemdebruijn.kernel@gmail.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, willemb@google.com
To: willemdebruijn.kernel@gmail.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([23.128.96.9]:45154 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387714AbeGMAJD (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 12 Jul 2018 20:09:03 -0400
In-Reply-To: <20180711160046.198091-1-willemdebruijn.kernel@gmail.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Date: Wed, 11 Jul 2018 12:00:44 -0400

> From: Willem de Bruijn <willemb@google.com>
> 
> 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>

Applied and queued up for -stable.