提交 11eb2645 编写于 作者: Z Zefan Li 提交者: David S. Miller

dlci: acquire rtnl_lock before calling __dev_get_by_name()

Otherwise the net device returned can be freed at anytime.
Signed-off-by: NLi Zefan <lizefan@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 a5cc68f3
...@@ -385,20 +385,24 @@ static int dlci_del(struct dlci_add *dlci) ...@@ -385,20 +385,24 @@ static int dlci_del(struct dlci_add *dlci)
struct net_device *master, *slave; struct net_device *master, *slave;
int err; int err;
rtnl_lock();
/* validate slave device */ /* validate slave device */
master = __dev_get_by_name(&init_net, dlci->devname); master = __dev_get_by_name(&init_net, dlci->devname);
if (!master) if (!master) {
return -ENODEV; err = -ENODEV;
goto out;
}
if (netif_running(master)) { if (netif_running(master)) {
return -EBUSY; err = -EBUSY;
goto out;
} }
dlp = netdev_priv(master); dlp = netdev_priv(master);
slave = dlp->slave; slave = dlp->slave;
flp = netdev_priv(slave); flp = netdev_priv(slave);
rtnl_lock();
err = (*flp->deassoc)(slave, master); err = (*flp->deassoc)(slave, master);
if (!err) { if (!err) {
list_del(&dlp->list); list_del(&dlp->list);
...@@ -407,8 +411,8 @@ static int dlci_del(struct dlci_add *dlci) ...@@ -407,8 +411,8 @@ static int dlci_del(struct dlci_add *dlci)
dev_put(slave); dev_put(slave);
} }
out:
rtnl_unlock(); rtnl_unlock();
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册