linux-kernel - [PATCH v3 1/2 RESEND] resolve gtp possible deadlock warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <a226d1132aa6f7e1e5d9b9054bbf5c291fcfa664.1729031472.git.danielyangkang@gmail.com>
Date: Tue, 15 Oct 2024 15:48:04 -0700
From: Daniel Yang <danielyangkang@...il.com>
To: Wenjia Zhang <wenjia@...ux.ibm.com>,
	Jan Karcher <jaka@...ux.ibm.com>,
	"D. Wythe" <alibuda@...ux.alibaba.com>,
	Tony Lu <tonylu@...ux.alibaba.com>,
	Wen Gu <guwen@...ux.alibaba.com>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	linux-s390@...r.kernel.org,
	netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Cc: danielyangkang@...il.com,
	syzbot+e953a8f3071f5c0a28fd@...kaller.appspotmail.com
Subject: [PATCH v3 1/2 RESEND] resolve gtp possible deadlock warning

From: D. Wythe <alibuda@...ux.alibaba.com>

Adds lockdep annotations on smc inet socket creation

Tested-by: Daniel Yang <danielyangkang@...il.com>
Signed-off-by: Daniel Yang <danielyangkang@...il.com>
Reported-by: syzbot+e953a8f3071f5c0a28fd@...kaller.appspotmail.com
---
 net/smc/smc_inet.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/net/smc/smc_inet.c b/net/smc/smc_inet.c
index a5b204160..7ae49ffd2 100644
--- a/net/smc/smc_inet.c
+++ b/net/smc/smc_inet.c
@@ -108,14 +108,39 @@ static struct inet_protosw smc_inet6_protosw = {
 };
 #endif /* CONFIG_IPV6 */
 
+static struct lock_class_key smc_slock_keys[2];
+static struct lock_class_key smc_keys[2];
+
 static int smc_inet_init_sock(struct sock *sk)
 {
 	struct net *net = sock_net(sk);
+	int rc;
 
 	/* init common smc sock */
 	smc_sk_init(net, sk, IPPROTO_SMC);
 	/* create clcsock */
-	return smc_create_clcsk(net, sk, sk->sk_family);
+	rc = smc_create_clcsk(net, sk, sk->sk_family);
+	if (rc)
+		return rc;
+
+	switch (sk->sk_family) {
+		case AF_INET:
+			sock_lock_init_class_and_name(sk, "slock-AF_INET-SMC",
+					&smc_slock_keys[0],
+					"sk_lock-AF_INET-SMC",
+					&smc_keys[0]);
+			break;
+		case AF_INET6:
+			sock_lock_init_class_and_name(sk, "slock-AF_INET6-SMC",
+					&smc_slock_keys[1],
+					"sk_lock-AF_INET6-SMC",
+					&smc_keys[1]);
+			break;
+		default:
+			WARN_ON_ONCE(1);
+	}
+
+	return 0;
 }
 
 int __init smc_inet_init(void)
-- 
2.39.2