From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D44071F0E25; Thu, 2 Apr 2026 17:36:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775151387; cv=none; b=iC4BMN+KeuKx863tLG8YNyaAIboyxpzbT2DPM4Y99lq+VhR7Oh9MOa5/whDbtIndoOhozjM2bztqqN2wqXb0Vk3ptkx74RB4TnUs7vSTslBfUuLI48+4dv6Bn7GNE9dUpqCsK3FQ4D/Q4Ak5yFcgRyKbGg6iFWbLy/ZG9UUupYg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775151387; c=relaxed/simple; bh=PSgkDJkeZhMmhWglvorZxNY2NC5HOwwTuIkE2PddNnA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iQ2KVfoXzWxtzSUaWU51B1jEfqCvCmWYdQglSN9jeIHhMqCMRs+X6V+ydFrA10HOToCJx6BpKhNhZV+lTGU+5E6OzGikLY10XydUfkqReNTfRnFkdrHxIKwrZW8q1e0+0RSFHwQME7IbAKEVlfdcTyOZPbNJgR8w42yEDjEYxgY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PkahzDFt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PkahzDFt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B096C116C6; Thu, 2 Apr 2026 17:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775151387; bh=PSgkDJkeZhMmhWglvorZxNY2NC5HOwwTuIkE2PddNnA=; h=From:To:Cc:Subject:Date:From; b=PkahzDFtaB4ZMQB7jrmPtShDMHc5pkMpVDeUgVik+rKJS3acABzOcP/0uBA/kpKzX +0qRtrlZmNElAuxdX6WVKmy64T0n7Ba8Jzag573Zfy/kahAFhfchwWxmGLmqDBdcWz Ojr9W3m7WHcmQDf8QDwCVfv21HKj0gF3tI2E7Y0rns2A+4DThdDN4L9jzFWgr1mETB q4S/cfCwcqq7Lvlyhbg55hyyxVhoPLttdSGnkg9LRqgmJB9tYRvAIGpPzDHkl800hz e2NP5J9179T50oY4LG8gtcWEomjsuexVqPDRja8XXMSNEaYB1oFWEbE3Ww0XbtrVRk gGS/eFaC8G1+Q== From: "Matthieu Baerts (NGI0)" To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Li Xiasong , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.6.y] MPTCP: fix lock class name family in pm_nl_create_listen_socket Date: Thu, 2 Apr 2026 19:36:17 +0200 Message-ID: <20260402173616.3331064-2-matttbe@kernel.org> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1483; i=matttbe@kernel.org; h=from:subject; bh=vS9H9xHqIUOIXyXZKbTchtWE7NAzMuAod/TwFoJBI5E=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLPrRQ8brEmz/rFBM9Vi3n//dhhHLhZQTtsc+Osbvsug zNzeI6zdJSyMIhxMciKKbJIt0Xmz3xexVvi5WcBM4eVCWQIAxenAEykWJCR4duu+qNcsddeT6/2 Uwlbcsrqzx2PnCRjxoQes9z3bifbtzH89428sO6l0b0risqVfwMv33TriPgQZLjQanmSV5CvXsw 8dgA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: 8bit From: Li Xiasong commit 7ab4a7c5d969642782b8a5b608da0dd02aa9f229 upstream. In mptcp_pm_nl_create_listen_socket(), use entry->addr.family instead of sk->sk_family for lock class setup. The 'sk' parameter is a netlink socket, not the MPTCP subflow socket being created. Fixes: cee4034a3db1 ("mptcp: fix lockdep false positive in mptcp_pm_nl_create_listen_socket()") Signed-off-by: Li Xiasong Reviewed-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260319112159.3118874-1-lixiasong1@huawei.com Signed-off-by: Jakub Kicinski [ Conflict in pm_kernel.c, because commit 8617e85e04bd ("mptcp: pm: split in-kernel PM specific code") is not in this version, and moves code from pm_netlink.c to pm_kernel.c. ] Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 91aaf4bd43ea..269e95c8415f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1189,7 +1189,7 @@ static struct lock_class_key mptcp_keys[2]; static int mptcp_pm_nl_create_listen_socket(struct sock *sk, struct mptcp_pm_addr_entry *entry) { - bool is_ipv6 = sk->sk_family == AF_INET6; + bool is_ipv6 = entry->addr.family == AF_INET6; int addrlen = sizeof(struct sockaddr_in); struct sockaddr_storage addr; struct sock *newsk, *ssk; -- 2.53.0