iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
Eric Garver a6cc63e125 openvswitch: Fix pop_vlan action for double tagged frames 
[ Upstream commit c48e74736fccf25fb32bb015426359e1c2016e3b ]

skb_vlan_pop() expects skb->protocol to be a valid TPID for double
tagged frames. So set skb->protocol to the TPID and let skb_vlan_pop()
shift the true ethertype into position for us.

Fixes: 5108bbaddc37 ("openvswitch: add processing of L3 packets")
Signed-off-by: Eric Garver <e@erig.me>
Reviewed-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-02 20:31:10 +01:00
..
6lowpan
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
9p
net/9p: Switch to wait_event_killable()
2017-11-30 08:40:49 +00:00
802
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
8021q
vlan: fix a use-after-free in vlan_device_event()
2017-11-11 19:35:32 +09:00
appletalk
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
atm
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ax25
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-08-09 16:28:45 -07:00
bluetooth
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
bpf
bpf: Align packet data properly in program testing framework.
2017-05-02 11:46:28 -04:00
bridge
net: bridge: fix early call to br_stp_change_bridge_id and plug newlink leaks
2018-01-02 20:31:09 +01:00
caif
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
can
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ceph
libceph: don't WARN() if user tries to add invalid key
2017-11-30 08:40:45 +00:00
core
sock: free skb in skb_complete_tx_timestamp on error
2018-01-02 20:31:09 +01:00
dcb
rtnetlink: make rtnl_register accept a flags parameter
2017-08-09 16:57:38 -07:00
dccp
tcp/dccp: block bh before arming time_wait timer
2017-12-17 15:07:57 +01:00
decnet
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
dns_resolver
KEYS: Fix race between updating and finding a negative key
2017-10-18 09:12:40 +01:00
dsa
net: dsa: return after vlan prepare phase
2017-11-11 15:45:09 +09:00
ethernet
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
hsr
net/hsr: Check skb_put_padto() return value
2017-08-22 13:40:23 -07:00
ieee802154
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ife
MAINTAINERS: Update Yotam's E-mail
2017-11-01 12:19:03 +09:00
ipv4
tcp: invalidate rate samples during SACK reneging
2018-01-02 20:31:09 +01:00
ipv6
ip6_gre: fix device features for ioctl setup
2018-01-02 20:31:09 +01:00
ipx
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
iucv
iucv: Convert sk_wmem_alloc accesses to refcount_t.
2017-07-03 02:31:22 -07:00
kcm
fix kcm_clone()
2017-12-17 15:07:59 +01:00
key
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-08-15 20:23:23 -07:00
l2tp
l2tp: cleanup l2tp_tunnel_delete calls
2017-12-20 10:10:31 +01:00
l3mdev
…
lapb
net, lapb: convert lapb_cb.refcnt from atomic_t to refcount_t
2017-07-04 22:35:16 +01:00
llc
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mac80211
License cleanup: add SPDX license identifiers to some files
2017-11-02 10:04:46 -07:00
mac802154
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mpls
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ncsi
net/ncsi: Fix length of GVI response packet
2017-10-21 01:56:38 +01:00
netfilter
netfilter: ipvs: Fix inappropriate output of procfs
2017-12-20 10:10:25 +01:00
netlabel
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
netlink
netlink: Add netns check on taps
2018-01-02 20:31:06 +01:00
netrom
net, netrom: convert nr_node.refcount from atomic_t to refcount_t
2017-07-04 22:35:17 +01:00
nfc
NFC: fix device-allocation error return
2017-11-30 08:40:55 +00:00
nsh
nsh: add GSO support
2017-08-29 15:16:52 -07:00
openvswitch
openvswitch: Fix pop_vlan action for double tagged frames
2018-01-02 20:31:10 +01:00
packet
net/packet: fix a race in packet_bind() and packet_notifier()
2017-12-17 15:07:56 +01:00
phonet
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
psample
MAINTAINERS: Update Yotam's E-mail
2017-11-01 12:19:03 +09:00
qrtr
qrtr: Move to postcore_initcall
2017-11-08 14:32:18 +09:00
rds
RDS: Check cmsg_len before dereferencing CMSG_DATA
2018-01-02 20:31:07 +01:00
rfkill
net: rfkill: gpio: Switch to devm_acpi_dev_add_driver_gpios()
2017-06-13 11:07:51 +02:00
rose
…
rxrpc
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
sched
cls_bpf: don't decrement net's refcount when offload fails
2017-12-17 15:07:59 +01:00
sctp
sctp: Replace use of sockets_allocated with specified macro.
2018-01-02 20:31:08 +01:00
smc
net/smc: use sk_rcvbuf as start for rmb creation
2017-12-14 09:53:05 +01:00
strparser
strparser: Use delayed work instead of timer for msg timeout
2017-10-25 10:37:11 +09:00
sunrpc
xprtrdma: Don't defer fencing an async RPC's chunks
2017-12-20 10:10:36 +01:00
switchdev
net: switchdev: Remove bridge bypass support from switchdev
2017-08-07 14:48:48 -07:00
tipc
tipc: call tipc_rcv() only if bearer is up in tipc_udp_recv()
2017-12-17 15:07:57 +01:00
tls
tls: Use kzalloc for aead_request allocation
2017-12-14 09:53:13 +01:00
unix
License cleanup: add SPDX license identifiers to some files
2017-11-02 10:04:46 -07:00
vmw_vsock
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
wimax
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
wireless
License cleanup: add SPDX license identifiers to some files
2017-11-02 10:04:46 -07:00
x25
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xfrm
xfrm: Copy policy family in clone_policy
2017-12-14 09:53:13 +01:00
compat.c
net: compat: assert the size of cmsg copied in is as expected
2017-09-20 15:36:18 -07:00
Kconfig
net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.
2017-09-04 13:25:20 +02:00
Makefile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
socket.c
net: fixes for skb_send_sock
2017-08-16 11:27:52 -07:00
sysctl_net.c
sysctl: Remove dead register_sysctl_root
2017-04-16 23:42:49 -05:00