summary refs log tree commit diff
path: root/net/sched/sch_generic.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2011-02-20 11:49:45 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-20 11:49:45 -0800
commit5f04d5068a90602b93a7953e9a47c496705c6976 (patch)
tree272ea087a13648cb3dd34e0feed08cfc4b1e5e2c /net/sched/sch_generic.c
parent2205a6ea93fea76f88b43727fea53f3ce3790d6f (diff)
downloadlinux-5f04d5068a90602b93a7953e9a47c496705c6976.tar.gz
net: Fix more stale on-stack list_head objects.
From: Eric W. Biederman <ebiederm@xmission.com>

In the beginning with batching unreg_list was a list that was used only
once in the lifetime of a network device (I think).  Now we have calls
using the unreg_list that can happen multiple times in the life of a
network device like dev_deactivate and dev_close that are also using the
unreg_list.  In addition in unregister_netdevice_queue we also do a
list_move because for devices like veth pairs it is possible that
unregister_netdevice_queue will be called multiple times.

So I think the change below to fix dev_deactivate which Eric D. missed
will fix this problem.  Now to go test that.

Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r--net/sched/sch_generic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 34dc598440a2..1bc698039ae2 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -839,6 +839,7 @@ void dev_deactivate(struct net_device *dev)
 
 	list_add(&dev->unreg_list, &single);
 	dev_deactivate_many(&single);
+	list_del(&single);
 }
 
 static void dev_init_scheduler_queue(struct net_device *dev,