mptcp: fix locking for in-kernel listener creation
authorPaolo Abeni <pabeni@redhat.com>
Tue, 7 Feb 2023 13:04:15 +0000 (14:04 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Feb 2023 09:39:34 +0000 (09:39 +0000)
commitad2171009d968104ccda9dc517f5a3ba891515db
tree62e192b0d8927fd7c3a10b2c828622d5100afa0f
parent21e43569685de4ad773fb060c11a15f3fd5e7ac4
mptcp: fix locking for in-kernel listener creation

For consistency, in mptcp_pm_nl_create_listen_socket(), we need to
call the __mptcp_nmpc_socket() under the msk socket lock.

Note that as a side effect, mptcp_subflow_create_socket() needs a
'nested' lockdep annotation, as it will acquire the subflow (kernel)
socket lock under the in-kernel listener msk socket lock.

The current lack of locking is almost harmless, because the relevant
socket is not exposed to the user space, but in future we will add
more complexity to the mentioned helper, let's play safe.

Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/pm_netlink.c
net/mptcp/subflow.c