]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commit
vlan: Avoid hwaccel vlan packets when vid not used.
authorJesse Gross <jesse@nicira.com>
Mon, 8 Nov 2010 21:23:01 +0000 (13:23 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Dec 2010 21:33:29 +0000 (13:33 -0800)
commit1b7cd15c8c89f5c26dc525d985e45c9bd9265fe2
tree64f060d8b13586a7df0984dd1d91134ce43f7f44
parent70d5f4e7ddb91da21169629548b763cc1244c374
vlan: Avoid hwaccel vlan packets when vid not used.

[This patch applies only to 2.6.36 stable.  The problem was introduced
in that release and is already fixed by larger changes to the vlan
code in 2.6.37.]

Normally hardware accelerated vlan packets are quickly dropped if
there is no corresponding vlan device configured.  The one exception
is promiscuous mode, where we allow all of these packets through so
they can be picked up by tcpdump.  However, this behavior causes a
crash if we actually try to receive these packets.  This fixes that
crash by ignoring packets with vids not corresponding to a configured
device in the vlan hwaccel routines and then dropping them before they
get to consumers in the network stack.

Reported-by: Ben Greear <greearb@candelatech.com>
Tested-by: Nikola Ciprich <extmaillist@linuxbox.cz>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/8021q/vlan_core.c
net/core/dev.c