diff mbox

[3.8.y.z,extended,stable] Patch "dlci: acquire rtnl_lock before calling __dev_get_by_name()" has been added to staging queue

Message ID 1372377064-12246-1-git-send-email-kamal@canonical.com
State New
Headers show

Commit Message

Kamal Mostafa June 27, 2013, 11:51 p.m. UTC 
This is a note to let you know that I have just added a patch titled

    dlci: acquire rtnl_lock before calling __dev_get_by_name()

to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue

This patch is scheduled to be released in version 3.8.13.4.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.8.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

From a9ad9bda2b9e02b7cf7e411acdc5edf292157e7f Mon Sep 17 00:00:00 2001
From: Zefan Li <lizefan@huawei.com>
Date: Wed, 26 Jun 2013 15:29:54 +0800
Subject: dlci: acquire rtnl_lock before calling __dev_get_by_name()

commit 11eb2645cbf38a08ae491bf6c602eea900ec0bb5 upstream.

Otherwise the net device returned can be freed at anytime.

Signed-off-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/net/wan/dlci.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--
1.8.1.2
diff mbox

Patch

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 147614e..1f6e053 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;
 }