From nobody Mon Apr 6 10:31:29 2026 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 560F336F40C; Thu, 2 Apr 2026 17:42:07 +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=1775151727; cv=none; b=ngJtXDANOYWL8gLPiOBVxUau6lYEcCeXta8VAOt8kNRfCxSCq3AjV4b7ZCRxrsAbWZG5c+cJPsVaNlI8cIOdx002eGwhIsFvQeVjjDoEEfcifnn39O+dVmCrE0lJZQMTMBE5D26HpUly6wYaSnrf25qW54YpRKUlIkQsNC+ogiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775151727; c=relaxed/simple; bh=A1GzfmivvuhCSCB/nkSJihhA1T5J/EcQFeWiGdMOIy8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CAoM5OYpKAiAAQAaJ47GpOCm0aXcnV673C5iWTFT3MolY4z1d/53cKneBqTxgmavPg0gpwAPOxP3dVO1xvmDE3Gx4LGyVdB1xNLCDl9PUMkQuCYn4LkWbgETy9ul90JCpg21gLDxLtJZLGm/z0vSqt4MikdIO/Bdlk7HwvAh5MA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A2wmrbjv; 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="A2wmrbjv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2250C116C6; Thu, 2 Apr 2026 17:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775151727; bh=A1GzfmivvuhCSCB/nkSJihhA1T5J/EcQFeWiGdMOIy8=; h=From:To:Cc:Subject:Date:From; b=A2wmrbjvi2aspjTF32LSuFNS82MuDzntfoLqmf/oFFQmggi7HjNi2pzb4Rv109H7d ceWjEdV9CH2mYB0GSVwIktlzDnpIWZCn1KagNwVdy4oKm78YXb/SlHK7Swgx+ZYEpk CoPS6ivA71tXJ+B/AQ6ejjXhn0bdAXyv7sXkG9EeJ4qkFhpwlzLsjnBtvaxbhUPyG8 NvAMNLSOBhnELvfTeDl3GYOWLq9vgPoJ4yg6HwOd0ZEfDOJT5l/yLFeg2J/2cAzdmk BErgtxrXYg8q2Tp04ILtrDaWJ/z0ne/c4TbEFo9gP5rRnbC//ECQcWBiFx4IR3f73c RRERWvyfhGiBA== From: "Matthieu Baerts (NGI0)" To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Li Xiasong , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 5.15.y] MPTCP: fix lock class name family in pm_nl_create_listen_socket Date: Thu, 2 Apr 2026 19:42:01 +0200 Message-ID: <20260402174200.3474039-2-matttbe@kernel.org> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1479; i=matttbe@kernel.org; h=from:subject; bh=AwTs4DicXzyi2VlRzLAa8AqUkkfLg1gGpoGeSakWuxc=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLPrcrojvkibiIatrz6veT3x8d4dtnt3/h5QUtY8U1JD 4auK2H+HaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABM5uoXhf+bhIs+HT/6tvr6B ddrMm+4Mon6cxr9DTDIl1Dt//0iWTmFk+M9Wl3Nwb5yt9LrKoviTYvu713mVSxgF3VXe1LNjZT4 7BwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_crea= te_listen_socket()") Signed-off-by: Li Xiasong Reviewed-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260319112159.3118874-1-lixiasong1@huawei.c= om 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 634fe0360c49..03e9a861140c 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1042,7 +1042,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 =3D sk->sk_family =3D=3D AF_INET6; + bool is_ipv6 =3D entry->addr.family =3D=3D AF_INET6; int addrlen =3D sizeof(struct sockaddr_in); struct sockaddr_storage addr; struct socket *ssock; --=20 2.53.0