From: David S. Miller <davem@davemloft.net>
Date: Fri, 6 Nov 2009 06:37:11 +0000 (-0800)
Subject: net: Fix build warning in sock_bindtodevice().
X-Git-Tag: upstream/snapshot3+hdmi~16449^2~489
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=000ba2e43f33901859fd794bb33c885909d53b3b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

net: Fix build warning in sock_bindtodevice().

net/core/sock.c: In function 'sock_setsockopt':
net/core/sock.c:396: warning: 'index' may be used uninitialized in this function
net/core/sock.c:396: note: 'index' was declared here

GCC can't see that all paths initialize index, so just
set it to the default (0) and eliminate the specific
code block that handles the null device name string.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index 38820ea..76ff58d 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -417,9 +417,8 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
 	if (copy_from_user(devname, optval, optlen))
 		goto out;
 
-	if (devname[0] == '\0') {
-		index = 0;
-	} else {
+	index = 0;
+	if (devname[0] != '\0') {
 		struct net_device *dev;
 
 		rcu_read_lock();