redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

tun: return proper error code from tun_do_read 

Instead of -1 with EAGAIN, read on a O_NONBLOCK tun fd will return 0.  This
fixes this by properly returning the error code from __skb_recv_datagram.

Signed-off-by: Alex Gartrell <agartrell@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Alex Gartrell 2014-12-25 23:22:49 -08:00 committed by David S. Miller
parent 87897931c8
commit 957f094f22
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tun.c
View File

@ -1380,7 +1380,7 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
skb = __skb_recv_datagram(tfile->socket.sk, noblock ? MSG_DONTWAIT : 0,
&peeked, &off, &err);
if (!skb)
return 0;
return err;
ret = tun_put_user(tun, tfile, skb, to);
if (unlikely(ret < 0))