UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jason Wang 2016-07-04 13:53:38 +08:00 committed by David S. Miller
parent 22f8788388
commit f48cc6b266
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/tun.c
View File

@ -1447,12 +1447,13 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
{ {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
int error = 0;
skb = skb_array_consume(&tfile->tx_array); skb = skb_array_consume(&tfile->tx_array);
if (skb) if (skb)
goto out; goto out;
if (noblock) { if (noblock) {
*err = -EAGAIN; error = -EAGAIN;
goto out; goto out;
} }
@ -1464,11 +1465,11 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
if (skb) if (skb)
break; break;
if (signal_pending(current)) { if (signal_pending(current)) {
*err = -ERESTARTSYS; error = -ERESTARTSYS;
break; break;
} }
if (tfile->socket.sk->sk_shutdown & RCV_SHUTDOWN) { if (tfile->socket.sk->sk_shutdown & RCV_SHUTDOWN) {
*err = -EFAULT; error = -EFAULT;
break; 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); remove_wait_queue(&tfile->wq.wait, &wait);
out: out:
*err = error;
return skb; return skb;
} }