diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-05-19 15:39:25 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-05-19 15:39:25 -0700 |
commit | 9093bbb2d96d0184f037cea9b4e952a44ebe7c32 (patch) | |
tree | ac2db6fbe7ead1f6f8ef200068c0db24576bcab9 /net/core/net-sysfs.c | |
parent | d8cf27287ac7fb5cbfcc4139917a997c39d841ca (diff) |
[NET]: Fix race condition about network device name allocation.
Kenji Kaneshige found this race between device removal and
registration. On unregister it is possible for the old device to
exist, because sysfs file is still open. A new device with 'eth%d'
will select the same name, but sysfs kobject register will fial.
The following changes the shutdown order slightly. It hold a removes
the sysfs entries earlier (on unregister_netdevice), but holds a
kobject reference. Then when todo runs the actual last put free
happens.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net-sysfs.c')
-rw-r--r-- | net/core/net-sysfs.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index b21307b15b8..5c19b0646d7 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -456,9 +456,15 @@ static struct class net_class = { #endif }; +/* Delete sysfs entries but hold kobject reference until after all + * netdev references are gone. + */ void netdev_unregister_sysfs(struct net_device * net) { - device_del(&(net->dev)); + struct device *dev = &(net->dev); + + kobject_get(&dev->kobj); + device_del(dev); } /* Create sysfs entries for network device. */ |