]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
MPTCP: fix lock class name family in pm_nl_create_listen_socket
authorLi Xiasong <lixiasong1@huawei.com>
Thu, 19 Mar 2026 11:21:59 +0000 (19:21 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 19 Mar 2026 16:37:48 +0000 (09:37 -0700)
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 <lixiasong1@huawei.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260319112159.3118874-1-lixiasong1@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/pm_kernel.c

index b2b9df43960e910d4be0d3d282b8cc3ff188c220..82e59f9c6dd9ce186e36ea85ed6f0de07f62b3bc 100644 (file)
@@ -838,7 +838,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;