Skip to content

Commit aaf9522

Browse files
gobenjidavem330
authored andcommitted
netiucv: Hold rtnl between name allocation and device registration.
fixes a race condition between concurrent initializations of netiucv devices that try to use the same name. sysfs: cannot create duplicate filename '/devices/iucv/netiucv2' [...] Call Trace: ([<00000000002edea4>] sysfs_add_one+0xb0/0xdc) [<00000000002eecd4>] create_dir+0x80/0xfc [<00000000002eee38>] sysfs_create_dir+0xe8/0x118 [<00000000003835a8>] kobject_add_internal+0x120/0x2d0 [<00000000003839d6>] kobject_add+0x62/0x9c [<00000000003d9564>] device_add+0xcc/0x510 [<000003e00212c7b4>] netiucv_register_device+0xc0/0x1ec [netiucv] Signed-off-by: Benjamin Poirier <[email protected]> Tested-by: Ursula Braun <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c9bfbb3 commit aaf9522

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/s390/net/netiucv.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2040,6 +2040,7 @@ static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
20402040
netiucv_setup_netdevice);
20412041
if (!dev)
20422042
return NULL;
2043+
rtnl_lock();
20432044
if (dev_alloc_name(dev, dev->name) < 0)
20442045
goto out_netdev;
20452046

@@ -2061,6 +2062,7 @@ static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
20612062
out_fsm:
20622063
kfree_fsm(privptr->fsm);
20632064
out_netdev:
2065+
rtnl_unlock();
20642066
free_netdev(dev);
20652067
return NULL;
20662068
}
@@ -2100,6 +2102,7 @@ static ssize_t conn_write(struct device_driver *drv,
21002102

21012103
rc = netiucv_register_device(dev);
21022104
if (rc) {
2105+
rtnl_unlock();
21032106
IUCV_DBF_TEXT_(setup, 2,
21042107
"ret %d from netiucv_register_device\n", rc);
21052108
goto out_free_ndev;
@@ -2109,7 +2112,8 @@ static ssize_t conn_write(struct device_driver *drv,
21092112
priv = netdev_priv(dev);
21102113
SET_NETDEV_DEV(dev, priv->dev);
21112114

2112-
rc = register_netdev(dev);
2115+
rc = register_netdevice(dev);
2116+
rtnl_unlock();
21132117
if (rc)
21142118
goto out_unreg;
21152119

0 commit comments

Comments
 (0)