Eric Dumazet d4b812dea4 vlan: mask vlan prio bits ... 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>		2013-07-18 13:05:23 -07:00
..
acpi	PCI changes for the v3.11 merge window:	2013-07-03 16:31:35 -07:00
asm-generic	Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2013-07-07 11:01:19 -07:00
clocksource
crypto
drm	drm/cma: remove GEM CMA specific dma_buf functionality	2013-07-05 15:44:54 +10:00
dt-bindings	ARM: at91: dt: add header to define at_hdmac configuration	2013-07-05 11:40:53 +05:30
keys
kvm
linux	vlan: mask vlan prio bits	2013-07-18 13:05:23 -07:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-13 17:42:22 -07:00
pcmcia
ras
rdma	Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next	2013-07-08 11:22:11 -07:00
rxrpc
scsi
sound
target	target: make queue_tm_rsp() return void	2013-07-07 18:36:53 -07:00
trace	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-07-11 12:57:19 -07:00
uapi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-07-14 11:42:26 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
Kbuild