diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-17 06:45:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-18 13:43:58 -0800 |
| commit | a5ad94d1e45df0cc29918fb5309ef85b99fc58c5 (patch) | |
| tree | 61bd2dc8eb7f8991f43588a57ded82194d22c93c /net | |
| parent | 0d1bb4e684935fce3fc71bdeb6c1fc89af8e59bb (diff) | |
vlan: Fix register_vlan_dev() error path
[ Upstream commit 6b863d1d3239eff0f45c2e6e672f5b56db828db0 ]
In case register_netdevice() returns an error, and a new vlan_group
was allocated and inserted in vlan_group_hash[] we call
vlan_group_free() without deleting group from hash table. Future
lookups can give infinite loops or crashes.
We must delete the vlan_group using RCU safe procedure.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index fe649081fbdc..db09b9466354 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -287,8 +287,11 @@ out_uninit_applicant: if (ngrp) vlan_gvrp_uninit_applicant(real_dev); out_free_group: - if (ngrp) - vlan_group_free(ngrp); + if (ngrp) { + hlist_del_rcu(&ngrp->hlist); + /* Free the group, after all cpu's are done. */ + call_rcu(&ngrp->rcu, vlan_rcu_free); + } return err; } |