Eric Dumazet 37b25f3f99 vlan: mask vlan prio bits ... [ Upstream commit d4b812dea4 ] In commit 48cc32d38a ("vlan: don't deliver frames for unknown vlans to protocols") Florian made sure we set pkt_type to PACKET_OTHERHOST if the vlan id is set and we could find a vlan device for this particular id. But we also have a problem if prio bits are set. Steinar reported an issue on a router receiving IPv6 frames with a vlan tag of 4000 (id 0, prio 2), and tunneled into a sit device, because skb->vlan_tci is set. Forwarded frame is completely corrupted : We can see (8100:4000) being inserted in the middle of IPv6 source address : 16:48:00.780413 IP6 2001:16d8:8100:4000:ee1c:0:9d9:bc87 > 9f94:4d95:2001:67c:29f4::: ICMP6, unknown icmp6 type (0), length 64 0x0000: 0000 0029 8000 c7c3 7103 0001 a0ae e651 0x0010: 0000 0000 ccce 0b00 0000 0000 1011 1213 0x0020: 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 0x0030: 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 It seems we are not really ready to properly cope with this right now. We can probably do better in future kernels : vlan_get_ingress_priority() should be a netdev property instead of a per vlan_dev one. For stable kernels, lets clear vlan_tci to fix the bugs. Reported-by: Steinar H. Gunderson <sesse@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-07-28 16:30:05 -07:00
..
acpi	ACPI / dock / PCI: Synchronous handling of dock events for PCI devices	2013-06-24 11:22:53 +02:00
asm-generic	Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2013-06-11 11:16:43 -07:00
clocksource	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -07:00
crypto	crypto: sha512 - Expose generic sha512 routine to be callable from other modules	2013-04-25 21:00:57 +08:00
drm	Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux	2013-05-21 08:50:57 -07:00
dt-bindings	ARM: dt: create a DT header for the GIC	2013-04-05 12:23:24 -06:00
keys
linux	vlan: mask vlan prio bits	2013-07-28 16:30:05 -07:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-06-18 06:25:08 -10:00
memory
misc
net	ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data	2013-07-28 16:29:49 -07:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'postmerge' into for-linus	2013-05-10 07:54:01 -07:00
sound	ASoC: dapm: Treat DAI widgets like AIF widgets for power	2013-06-07 15:54:50 +01:00
target	target: Propigate up ->cmd_kref put return via transport_generic_free_cmd	2013-05-31 01:21:23 -07:00
trace	Fixed regressions (two stability regressions and a performance	2013-05-14 09:30:54 -07:00
uapi	net: Swap ver and type in pppoe_hdr	2013-07-28 16:29:46 -07:00
video	Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes	2013-05-29 17:00:34 +08:00
xen	xenbus: delay xenbus frontend resume if xenstored is not running	2013-05-29 09:04:19 -04:00
Kbuild	UAPI: remove empty Kbuild files	2013-04-30 17:04:09 -07:00