tun: fix build warnings

Stephen Rothwell reports a build warnings(powerpc ppc64_defconfig)

drivers/net/tun.c: In function 'tun_do_read.part.5':
/home/sfr/next/next/drivers/net/tun.c:1491:6: warning: 'err' may be
used uninitialized in this function [-Wmaybe-uninitialized]
   int err;

This is because tun_ring_recv() may return an uninitialized err, fix this.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 74752159ec344b38851c8eac1bce3435699fd90c..5eadb7a1ad7bfec2237ffe33744efca336ea02f3 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1447,12 +1447,13 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
 {
        DECLARE_WAITQUEUE(wait, current);
        struct sk_buff *skb = NULL;
+       int error = 0;
 
        skb = skb_array_consume(&tfile->tx_array);
        if (skb)
                goto out;
        if (noblock) {
-               *err = -EAGAIN;
+               error = -EAGAIN;
                goto out;
        }
 
@@ -1464,11 +1465,11 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
                if (skb)
                        break;
                if (signal_pending(current)) {
-                       *err = -ERESTARTSYS;
+                       error = -ERESTARTSYS;
                        break;
                }
                if (tfile->socket.sk->sk_shutdown & RCV_SHUTDOWN) {
-                       *err = -EFAULT;
+                       error = -EFAULT;
                        break;
                }
 
@@ -1479,6 +1480,7 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
        remove_wait_queue(&tfile->wq.wait, &wait);
 
 out:
+       *err = error;
        return skb;
 }