]> git.ipfire.org Git - thirdparty/linux.git/commit
tcp: check mptcp-level constraints for backlog coalescing
authorPaolo Abeni <pabeni@redhat.com>
Wed, 18 Oct 2023 18:23:53 +0000 (11:23 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 19 Oct 2023 16:10:00 +0000 (09:10 -0700)
commit6db8a37dfc541e059851652cfd4f0bb13b8ff6af
tree057cb1b56e78baa16204a9c841058e966e18df66
parentb134a5805455d1886662a6516c965cdb9df9fbcc
tcp: check mptcp-level constraints for backlog coalescing

The MPTCP protocol can acquire the subflow-level socket lock and
cause the tcp backlog usage. When inserting new skbs into the
backlog, the stack will try to coalesce them.

Currently, we have no check in place to ensure that such coalescing
will respect the MPTCP-level DSS, and that may cause data stream
corruption, as reported by Christoph.

Address the issue by adding the relevant admission check for coalescing
in tcp_add_backlog().

Note the issue is not easy to reproduce, as the MPTCP protocol tries
hard to avoid acquiring the subflow-level socket lock.

Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
Cc: stable@vger.kernel.org
Reported-by: Christoph Paasch <cpaasch@apple.com>
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/420
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231018-send-net-20231018-v1-2-17ecb002e41d@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/tcp_ipv4.c