rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tun bug causing Juniper VPN failure (rhbz 1204512)

This commit is contained in:
Josh Boyer 2015-03-24 18:50:41 -04:00
parent 637101daa0
commit c21f3a3b5b
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel.spec
View File

@ -656,6 +656,9 @@ Patch30001: aarch64-fix-tlb-issues.patch
Patch26173: net-validate-the-range-we-feed-to-iov_iter_init-in-s.patch
#rhbz 1204512
Patch26174: tun-return-proper-error-code-from-tun_do_read.patch
# END OF PATCH DEFINITIONS
%endif
@ -1422,6 +1425,9 @@ ApplyPatch kernel-arm64.patch -R
ApplyPatch net-validate-the-range-we-feed-to-iov_iter_init-in-s.patch
#rhbz 1204512
ApplyPatch tun-return-proper-error-code-from-tun_do_read.patch
# END OF PATCH APPLICATIONS
%endif
@ -2281,6 +2287,9 @@ fi
# ||----w |
# || ||
%changelog
* Tue Mar 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
- Fix tun bug causing Juniper VPN failure (rhbz 1204512)
* Mon Mar 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.2-201
- Enable CONFIG_SND_BEBOB (rhbz 1204342)
- Validate iovec range in sys_sendto/sys_recvfrom

30
tun-return-proper-error-code-from-tun_do_read.patch Normal file
View File

@ -0,0 +1,30 @@
From 957f094f221f81e457133b1f4c4d95ffa49ff731 Mon Sep 17 00:00:00 2001
From: Alex Gartrell <agartrell@fb.com>
Date: Thu, 25 Dec 2014 23:22:49 -0800
Subject: [PATCH] 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>
---
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 df5e94871844..c0df872f5b8c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -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))
--
2.1.0