[SRU][Vivid][PATCH 1/1] tun: return proper error code from tun_do_read

Joseph Salisbury joseph.salisbury at canonical.com
Tue Apr 28 20:38:40 UTC 2015


From: Alex Gartrell <agartrell at fb.com>

BugLink: http://bugs.launchpad.net/bugs/1448942

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 at fb.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 957f094f221f81e457133b1f4c4d95ffa49ff731)
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 drivers/net/tun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 10f9e40..9a409a8f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1368,7 +1368,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))
-- 
2.1.0





More information about the kernel-team mailing list