---

yaml --- r: 171182 b: refs/heads/master c: bf8e56b h: refs/heads/master v: v3
git-mirror · Nov 6, 2009 · fdb27ef · fdb27ef
1 parent 5e67ad8
commit fdb27ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69df9d5993bd7dd7499ad0e98fe824147fbe5667
+refs/heads/master: bf8e56bfc4fcfcef9f08e6233dc619706807893a
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -420,14 +420,16 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
 	if (devname[0] == '\0') {
 		index = 0;
 	} else {
-		struct net_device *dev = dev_get_by_name(net, devname);
+		struct net_device *dev;
 
+		rcu_read_lock();
+		dev = dev_get_by_name_rcu(net, devname);
+		if (dev)
+			index = dev->ifindex;
+		rcu_read_unlock();
 		ret = -ENODEV;
 		if (!dev)
 			goto out;
-
-		index = dev->ifindex;
-		dev_put(dev);
 	}
 
 	lock_sock(sk);