Commit 3f03e387 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

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

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: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d59b54b1
...@@ -124,8 +124,8 @@ static void __exit vlan_cleanup_module(void) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment