]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
mptcp: fastclose msk when linger time is 0
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Mon, 27 Apr 2026 19:54:35 +0000 (21:54 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 29 Apr 2026 01:36:27 +0000 (18:36 -0700)
commitf14d6e9c3678a067f304abba561e0c5446c7e845
tree5e0a4304d86aa2df8e73676c1bbb398c27b3a409
parentb5c52908d52c6c8eb8933264aa6087a0600fd892
mptcp: fastclose msk when linger time is 0

The SO_LINGER socket option has been supported for a while with MPTCP
sockets [1], but it didn't cause the equivalent of a TCP reset as
expected when enabled and its time was set to 0. This was causing some
behavioural differences with TCP where some connections were not
promptly stopped as expected.

To fix that, an extra condition is checked at close() time before
sending an MP_FASTCLOSE, the MPTCP equivalent of a TCP reset.

Note that backporting up to [1] will be difficult as more changes are
needed to be able to send MP_FASTCLOSE. It seems better to stop at [2],
which was supposed to already imitate TCP.

Validated with MPTCP packetdrill tests [3].

Fixes: 268b12387460 ("mptcp: setsockopt: support SO_LINGER") [1]
Fixes: d21f83485518 ("mptcp: use fastclose on more edge scenarios") [2]
Cc: stable@vger.kernel.org
Reported-by: Lance Tuller <lance@lance0.com>
Closes: https://github.com/lance0/xfr/pull/67
Link: https://github.com/multipath-tcp/packetdrill/pull/196
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260427-net-mptcp-misc-fixes-7-1-rc2-v1-3-7432b7f279fa@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/protocol.c