net: Fix build warning in sock_bindtodevice().
authorDavid S. Miller <davem@davemloft.net>
Fri, 6 Nov 2009 06:37:11 +0000 (22:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Nov 2009 06:37:11 +0000 (22:37 -0800)
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>
net/core/sock.c

index 38820eaecd4347291bf434735e89c93600b0f3c6..76ff58d43e261c34e630034571d7c48f34d16ffc 100644 (file)
@@ -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();