From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 29 Mar 2019 06:08:16 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v3.18.138~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=169c852a740dd902f902188b08dd158cb1a08e46;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	tun-add-a-missing-rcu_read_unlock-in-error-path.patch
---

diff --git a/queue-4.14/series b/queue-4.14/series
index 9a998c2677d..5374814feb5 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -21,3 +21,4 @@ sctp-get-sctphdr-by-offset-in-sctp_compute_cksum.patch
 net-aquantia-fix-rx-checksum-offload-for-udp-tcp-over-ipv6.patch
 mac8390-fix-mmio-access-size-probe.patch
 tun-properly-test-for-iff_up.patch
+tun-add-a-missing-rcu_read_unlock-in-error-path.patch
diff --git a/queue-4.14/tun-add-a-missing-rcu_read_unlock-in-error-path.patch b/queue-4.14/tun-add-a-missing-rcu_read_unlock-in-error-path.patch
new file mode 100644
index 00000000000..f96e1ba928d
--- /dev/null
+++ b/queue-4.14/tun-add-a-missing-rcu_read_unlock-in-error-path.patch
@@ -0,0 +1,32 @@
+From 9180bb4f046064dfa4541488102703b402bb04e1 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Sat, 16 Mar 2019 13:09:53 -0700
+Subject: tun: add a missing rcu_read_unlock() in error path
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit 9180bb4f046064dfa4541488102703b402bb04e1 upstream.
+
+In my latest patch I missed one rcu_read_unlock(), in case
+device is down.
+
+Fixes: 4477138fa0ae ("tun: properly test for IFF_UP")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/tun.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/tun.c
++++ b/drivers/net/tun.c
+@@ -1569,6 +1569,7 @@ drop:
+ 	rcu_read_lock();
+ 	if (unlikely(!(tun->dev->flags & IFF_UP))) {
+ 		err = -EIO;
++		rcu_read_unlock();
+ 		goto drop;
+ 	}
+