mptcp: ensure listener is unhashed before updating the sk status
authorPaolo Abeni <pabeni@redhat.com>
Tue, 20 Jun 2023 16:24:23 +0000 (18:24 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Jun 2023 05:44:54 +0000 (22:44 -0700)
commit57fc0f1ceaa4016354cf6f88533e20b56190e41a
treefb1230e45df2a73eb6443f9c89793f4c6fb10d3c
parentb7535cfed223a9f02f9530853616f197b386d775
mptcp: ensure listener is unhashed before updating the sk status

The MPTCP protocol access the listener subflow in a lockless
manner in a couple of places (poll, diag). That works only if
the msk itself leaves the listener status only after that the
subflow itself has been closed/disconnected. Otherwise we risk
deadlock in diag, as reported by Christoph.

Address the issue ensuring that the first subflow (the listener
one) is always disconnected before updating the msk socket status.

Reported-by: Christoph Paasch <cpaasch@apple.com>
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/407
Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation")
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: Jakub Kicinski <kuba@kernel.org>
net/mptcp/pm_netlink.c
net/mptcp/protocol.c