[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250523182128.59346-5-kuniyu@amazon.com>
Date: Fri, 23 May 2025 11:21:10 -0700
From: Kuniyuki Iwashima <kuniyu@...zon.com>
To: "David S. Miller" <davem@...emloft.net>, Eric Dumazet
<edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
<pabeni@...hat.com>, Willem de Bruijn <willemb@...gle.com>
CC: Simon Horman <horms@...nel.org>, Kuniyuki Iwashima <kuniyu@...zon.com>,
Kuniyuki Iwashima <kuni1840@...il.com>, Chuck Lever <chuck.lever@...cle.com>,
Jeff Layton <jlayton@...nel.org>, Matthieu Baerts <matttbe@...nel.org>,
"Keith Busch" <kbusch@...nel.org>, Jens Axboe <axboe@...nel.dk>, Christoph
Hellwig <hch@....de>, Wenjia Zhang <wenjia@...ux.ibm.com>, Jan Karcher
<jaka@...ux.ibm.com>, Steve French <sfrench@...ba.org>,
<netdev@...r.kernel.org>, <mptcp@...ts.linux.dev>,
<linux-nfs@...r.kernel.org>, <linux-rdma@...r.kernel.org>,
<linux-nvme@...ts.infradead.org>, <stable@...r.kernel.org>
Subject: [PATCH v2 net-next 4/7] smb: client: Add missing net_passive_dec().
While reverting commit e9f2517a3e18 ("smb: client: fix TCP timers deadlock
after rmmod"), I should have added net_passive_dec(), which was added
between the original commit and the revert by commit 5c70eb5c593d ("net:
better track kernel sockets lifetime").
Let's call net_passive_dec() in generic_ip_connect().
Note that this commit is only needed for 6.14+.
Fixes: 95d2b9f693ff ("Revert "smb: client: fix TCP timers deadlock after rmmod"")
Cc: <stable@...r.kernel.org> # 6.14.x
Signed-off-by: Kuniyuki Iwashima <kuniyu@...zon.com>
---
fs/smb/client/connect.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index 37a2ba38f10e..afac23a5a3ec 100644
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -3359,6 +3359,7 @@ generic_ip_connect(struct TCP_Server_Info *server)
sk = server->ssocket->sk;
__netns_tracker_free(net, &sk->ns_tracker, false);
+ net_passive_dec(net);
sk->sk_net_refcnt = 1;
get_net_track(net, &sk->ns_tracker, GFP_KERNEL);
sock_inuse_add(net, 1);
--
2.49.0
Powered by blists - more mailing lists