diff options
author | Paolo Abeni <pabeni@redhat.com> | 2022-06-28 03:02:38 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-29 05:45:42 +0200 |
commit | d51991e2e31477853e5b9c1005ac617707077286 (patch) | |
tree | b49c6d4c82eaf1dff520fecdd3caa84f60718956 /net/mptcp/options.c | |
parent | mptcp: invoke MP_FAIL response when needed (diff) | |
download | linux-d51991e2e31477853e5b9c1005ac617707077286.tar.xz linux-d51991e2e31477853e5b9c1005ac617707077286.zip |
mptcp: fix shutdown vs fallback race
If the MPTCP socket shutdown happens before a fallback
to TCP, and all the pending data have been already spooled,
we never close the TCP connection.
Address the issue explicitly checking for critical condition
at fallback time.
Fixes: 1e39e5a32ad7 ("mptcp: infinite mapping sending")
Fixes: 0348c690ed37 ("mptcp: add the fallback check")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mptcp/options.c')
-rw-r--r-- | net/mptcp/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 2a6351d55a7d..aead331866a0 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -967,7 +967,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, goto reset; subflow->mp_capable = 0; pr_fallback(msk); - __mptcp_do_fallback(msk); + mptcp_do_fallback(ssk); return false; } |