diff options
| author | Willem de Bruijn <willemb@google.com> | 2018-07-11 12:00:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-12 16:55:29 -0700 |
| commit | bab2c80e5a6c855657482eac9e97f5f3eedb509a (patch) | |
| tree | 737e565888fea5804ed4723789e1b604259ad5d6 | |
| parent | 8b7008620b8452728cadead460a36f64ed78c460 (diff) | |
| download | op-kernel-dev-bab2c80e5a6c855657482eac9e97f5f3eedb509a.zip op-kernel-dev-bab2c80e5a6c855657482eac9e97f5f3eedb509a.tar.gz | |
nsh: set mac len based on inner packet
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>
| -rw-r--r-- | net/nsh/nsh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nsh/nsh.c b/net/nsh/nsh.c index 9696ef9..1a30e16 100644 --- a/net/nsh/nsh.c +++ b/net/nsh/nsh.c @@ -104,7 +104,7 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb, __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; |
