History

dlci: acquire rtnl_lock before calling __dev_get_by_name()

Otherwise the net device returned can be freed at anytime.

Zefan Li committed 13 years ago

Commit 11eb2641 parent a5cc68f1 file · +9 −5Browse files

Unified · Split

drivers/net/wan/dlci.c+9−5
@@ -385,20 +385,24 @@ static int dlci_del(struct dlci_add *dlci) · 384 unmodified lines
385 struct net_device *master, *slave;385 struct net_device *master, *slave;
386 int err;386 int err;
387 387
388 rtnl_lock();
389
388 /* validate slave device */390 /* validate slave device */
389 master = __dev_get_by_name(&init_net, dlci->devname);391 master = __dev_get_by_name(&init_net, dlci->devname);
390 if (!master)392 if (!master) {
391 return -ENODEV;393 err = -ENODEV;
394 goto out;
395 }
392 396
393 if (netif_running(master)) {397 if (netif_running(master)) {
394 return -EBUSY;398 err = -EBUSY;
399 goto out;
395 }400 }
396 401
397 dlp = netdev_priv(master);402 dlp = netdev_priv(master);
398 slave = dlp->slave;403 slave = dlp->slave;
399 flp = netdev_priv(slave);404 flp = netdev_priv(slave);
400 405
401 rtnl_lock();
402 err = (*flp->deassoc)(slave, master);406 err = (*flp->deassoc)(slave, master);
403 if (!err) {407 if (!err) {
404 list_del(&dlp->list);408 list_del(&dlp->list);
@@ -407,8 +411,8 @@ static int dlci_del(struct dlci_add *dlci) · 2 unmodified lines
407 411
408 dev_put(slave);412 dev_put(slave);
409 }413 }
414out:
410 rtnl_unlock();415 rtnl_unlock();
411
412 return err;416 return err;
413}417}
414 418

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t