diff options
| author | Zefan Li <lizefan@huawei.com> | 2013-06-26 11:29:54 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-27 02:36:42 +0400 |
| commit | 11eb2645cbf38a08ae491bf6c602eea900ec0bb5 (patch) | |
| tree | aa6e7b01ff83084985633ec26b5913fa363d2e93 /drivers | |
| parent | a5cc68f3d63306d0d288f31edfc2ae6ef8ecd887 (diff) | |
| download | linux-11eb2645cbf38a08ae491bf6c602eea900ec0bb5.tar.xz | |
dlci: acquire rtnl_lock before calling __dev_get_by_name()
Otherwise the net device returned can be freed at anytime.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wan/dlci.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index 147614ed86aa..1f6e0538c716 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c @@ -385,20 +385,24 @@ static int dlci_del(struct dlci_add *dlci) struct net_device *master, *slave; int err; + rtnl_lock(); + /* validate slave device */ master = __dev_get_by_name(&init_net, dlci->devname); - if (!master) - return -ENODEV; + if (!master) { + err = -ENODEV; + goto out; + } if (netif_running(master)) { - return -EBUSY; + err = -EBUSY; + goto out; } dlp = netdev_priv(master); slave = dlp->slave; flp = netdev_priv(slave); - rtnl_lock(); err = (*flp->deassoc)(slave, master); if (!err) { list_del(&dlp->list); @@ -407,8 +411,8 @@ static int dlci_del(struct dlci_add *dlci) dev_put(slave); } +out: rtnl_unlock(); - return err; } |