leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[VLAN]: Fix potential race in vlan_cleanup_module vs vlan_ioctl_handler.

Browse Source 
The vlan module cleanup function starts with

	vlan_netlink_fini();
	vlan_ioctl_set(NULL);

The first call removes all the vlan devices and
the second one closes the vlan ioctl.

AFAIS there's a tiny race window between these two
calls - after rtnl unregistered all the vlans, but
the ioctl handler isn't set to NULL yet, user can
manage to call this ioctl and create one vlan device,
and that this function will later BUG_ON seeing
non-emply hashes.

I think, that we must first close the vlan ioctl
and only after this remove all the vlans with the
vlan_netlink_fini() call.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-12-11 02:41:25 -08:00 committed by David S. Miller
parent d59b54b150
commit 3f03e38789
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/8021q/vlan.c
View File

@ -124,8 +124,8 @@ static void __exit vlan_cleanup_module(void)
{ {
int i; int i;
vlan_netlink_fini();
vlan_ioctl_set(NULL); vlan_ioctl_set(NULL);
vlan_netlink_fini();
/* Un-register us from receiving netdevice events */ /* Un-register us from receiving netdevice events */
unregister_netdevice_notifier(&vlan_notifier_block); unregister_netdevice_notifier(&vlan_notifier_block);