diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-02-17 17:59:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-18 14:49:36 -0500 |
commit | ceaaec98ad99859ac90ac6863ad0a6cd075d8e0e (patch) | |
tree | 12754d2780860162b031e8c67c80866473cb4fe9 | |
parent | f87e6f47933e3ebeced9bb12615e830a72cedce4 (diff) |
net: deinit automatic LIST_HEAD
commit 9b5e383c11b08784 (net: Introduce
unregister_netdevice_many()) left an active LIST_HEAD() in
rollback_registered(), with possible memory corruption.
Even if device is freed without touching its unreg_list (and therefore
touching the previous memory location holding LISTE_HEAD(single), better
close the bug for good, since its really subtle.
(Same fix for default_device_exit_batch() for completeness)
Reported-by: Michal Hocko <mhocko@suse.cz>
Tested-by: Michal Hocko <mhocko@suse.cz>
Reported-by: Eric W. Biderman <ebiderman@xmission.com>
Tested-by: Eric W. Biderman <ebiderman@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Octavian Purdila <opurdila@ixiacom.com>
CC: stable <stable@kernel.org> [.33+]
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a18c1643ea9f..8ae6631abcc2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -5066,6 +5066,7 @@ static void rollback_registered(struct net_device *dev) | |||
5066 | 5066 | ||
5067 | list_add(&dev->unreg_list, &single); | 5067 | list_add(&dev->unreg_list, &single); |
5068 | rollback_registered_many(&single); | 5068 | rollback_registered_many(&single); |
5069 | list_del(&single); | ||
5069 | } | 5070 | } |
5070 | 5071 | ||
5071 | unsigned long netdev_fix_features(unsigned long features, const char *name) | 5072 | unsigned long netdev_fix_features(unsigned long features, const char *name) |
@@ -6219,6 +6220,7 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list) | |||
6219 | } | 6220 | } |
6220 | } | 6221 | } |
6221 | unregister_netdevice_many(&dev_kill_list); | 6222 | unregister_netdevice_many(&dev_kill_list); |
6223 | list_del(&dev_kill_list); | ||
6222 | rtnl_unlock(); | 6224 | rtnl_unlock(); |
6223 | } | 6225 | } |
6224 | 6226 | ||