From: Mahanta Jambigi <mjambigi@linux.ibm.com>
To: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, alibuda@linux.alibaba.com,
dust.li@linux.alibaba.com, sidraya@linux.ibm.com,
hidayath@linux.ibm.com
Cc: pasic@linux.ibm.com, horms@kernel.org, tonylu@linux.alibaba.com,
guwen@linux.alibaba.com, netdev@vger.kernel.org,
linux-s390@vger.kernel.org, linux-rdma@vger.kernel.org,
stable@vger.kernel.org, Mahanta Jambigi <mjambigi@linux.ibm.com>
Subject: [PATCH net] net/smc: serialize clcsock teardown in smc_accept_dequeue
Date: Mon, 24 Aug 2026 08:58:51 +0200 [thread overview]
Message-ID: <20260824065851.1070988-1-mjambigi@linux.ibm.com> (raw)
smc_accept_dequeue() open-codes clcsock teardown for SMC_CLOSED child sockets
without taking clcsock_release_lock:
new_sk->sk_prot->unhash(new_sk);
if (isk->clcsock) {
sock_release(isk->clcsock);
isk->clcsock = NULL;
}
This bypasses the clcsock_release_lock discipline used elsewhere in SMC clcsock
lifetime handling. In particular, other paths serialize clcsock access and
updates with clcsock_release_lock, but this local teardown path does not.
Fix it by taking clcsock_release_lock around the local teardown and by storing
NULL before sock_release(), matching the established ordering used by other
clcsock teardown paths.
Fixes: 127f49705823 ("net/smc: release clcsock from tcp_listen_worker")
Reviewed-by: Hidayath Khan <hidayath@linux.ibm.com>
Signed-off-by: Mahanta Jambigi <mjambigi@linux.ibm.com>
---
net/smc/af_smc.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 00403175b740..bbf8269876ee 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1833,10 +1833,14 @@ struct sock *smc_accept_dequeue(struct sock *parent,
smc_accept_unlink(new_sk);
if (new_sk->sk_state == SMC_CLOSED) {
new_sk->sk_prot->unhash(new_sk);
- if (isk->clcsock) {
- sock_release(isk->clcsock);
- isk->clcsock = NULL;
- }
+ mutex_lock(&isk->clcsock_release_lock);
+ if (isk->clcsock) {
+ struct socket *clcsock = isk->clcsock;
+
+ isk->clcsock = NULL;
+ sock_release(clcsock);
+ }
+ mutex_unlock(&isk->clcsock_release_lock);
sock_put(new_sk); /* final */
continue;
}
--
2.50.1 (Apple Git-155)
next reply other threads:[~2026-08-24 6:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-24 6:58 Mahanta Jambigi [this message]
2026-08-24 7:08 ` [PATCH net] net/smc: serialize clcsock teardown in smc_accept_dequeue sashiko-bot
2026-08-26 3:18 ` Dust Li
2026-08-26 9:12 ` Mahanta Jambigi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260824065851.1070988-1-mjambigi@linux.ibm.com \
--to=mjambigi@linux.ibm.com \
--cc=alibuda@linux.alibaba.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=dust.li@linux.alibaba.com \
--cc=edumazet@google.com \
--cc=guwen@linux.alibaba.com \
--cc=hidayath@linux.ibm.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=sidraya@linux.ibm.com \
--cc=stable@vger.kernel.org \
--cc=tonylu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox