git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dlci: acquire rtnl_lock before calling __dev_get_by_name()
[pandora-kernel.git]
/
drivers
/
net
/
wan
/
dlci.c
diff --git
a/drivers/net/wan/dlci.c
b/drivers/net/wan/dlci.c
index
48ab38a
..
fa8d72c
100644
(file)
--- a/
drivers/net/wan/dlci.c
+++ b/
drivers/net/wan/dlci.c
@@
-386,20
+386,24
@@
static int dlci_del(struct dlci_add *dlci)
struct net_device *master, *slave;
int err;
struct net_device *master, *slave;
int err;
+ rtnl_lock();
+
/* validate slave device */
master = __dev_get_by_name(&init_net, dlci->devname);
/* 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)) {
if (netif_running(master)) {
- return -EBUSY;
+ err = -EBUSY;
+ goto out;
}
dlp = netdev_priv(master);
slave = dlp->slave;
flp = netdev_priv(slave);
}
dlp = netdev_priv(master);
slave = dlp->slave;
flp = netdev_priv(slave);
- rtnl_lock();
err = (*flp->deassoc)(slave, master);
if (!err) {
list_del(&dlp->list);
err = (*flp->deassoc)(slave, master);
if (!err) {
list_del(&dlp->list);
@@
-408,8
+412,8
@@
static int dlci_del(struct dlci_add *dlci)
dev_put(slave);
}
dev_put(slave);
}
+out:
rtnl_unlock();
rtnl_unlock();
-
return err;
}
return err;
}