net: ip_gre: use erspan key field for tunnel lookup

Browse source

[ Upstream commit cb73ee40b1 ]

Use ERSPAN key header field as tunnel key in gre_parse_header routine
since ERSPAN protocol sets the key field of the external GRE header to
0 resulting in a tunnel lookup fail in ip6gre_err.
In addition remove key field parsing and pskb_may_pull check in
erspan_rcv and ip6erspan_rcv

Fixes: 5a963eb61b ("ip6_gre: Add ERSPAN native tunnel support")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Lorenzo Bianconi 2019-01-18 12:05:39 +01:00 • committed by Greg Kroah-Hartman

parent 3395c773ea

commit 5195acd38a

3 changed files with 17 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

net/ipv4/gre_demux.c

View file

9

net/ipv4/ip_gre.c

View file

4

net/ipv6/ip6_gre.c

View file