From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Jul 2022 14:37:36 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.9.322~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91c71de9e79c351a5948e34c4d8cb79107ada93a;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	net-tun-avoid-disabling-napi-twice.patch
---

diff --git a/queue-5.15/net-tun-avoid-disabling-napi-twice.patch b/queue-5.15/net-tun-avoid-disabling-napi-twice.patch
new file mode 100644
index 00000000000..c8e34aee528
--- /dev/null
+++ b/queue-5.15/net-tun-avoid-disabling-napi-twice.patch
@@ -0,0 +1,41 @@
+From ff1fa2081d173b01cebe2fbf0a2d0f1cee9ce4b5 Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kuba@kernel.org>
+Date: Wed, 29 Jun 2022 11:19:10 -0700
+Subject: net: tun: avoid disabling NAPI twice
+
+From: Jakub Kicinski <kuba@kernel.org>
+
+commit ff1fa2081d173b01cebe2fbf0a2d0f1cee9ce4b5 upstream.
+
+Eric reports that syzbot made short work out of my speculative
+fix. Indeed when queue gets detached its tfile->tun remains,
+so we would try to stop NAPI twice with a detach(), close()
+sequence.
+
+Alternative fix would be to move tun_napi_disable() to
+tun_detach_all() and let the NAPI run after the queue
+has been detached.
+
+Fixes: a8fc8cb5692a ("net: tun: stop NAPI when detaching queues")
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Reported-by: Eric Dumazet <edumazet@google.com>
+Reviewed-by: Eric Dumazet <edumazet@google.com>
+Link: https://lore.kernel.org/r/20220629181911.372047-1-kuba@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/tun.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/tun.c
++++ b/drivers/net/tun.c
+@@ -641,7 +641,8 @@ static void __tun_detach(struct tun_file
+ 	tun = rtnl_dereference(tfile->tun);
+ 
+ 	if (tun && clean) {
+-		tun_napi_disable(tfile);
++		if (!tfile->detached)
++			tun_napi_disable(tfile);
+ 		tun_napi_del(tfile);
+ 	}
+ 
diff --git a/queue-5.15/series b/queue-5.15/series
index db62e9122aa..c671a8845a9 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -55,3 +55,4 @@ tunnels-do-not-assume-mac-header-is-set-in-skb_tunnel_check_pmtu.patch
 ipv6-sit-fix-ipip6_tunnel_get_prl-return-value.patch
 ipv6-fix-lockdep-splat-in-in6_dump_addrs.patch
 mlxsw-spectrum_router-fix-rollback-in-tunnel-next-hop-init.patch
+net-tun-avoid-disabling-napi-twice.patch