mptcp: fix sk_forward_memory corruption on retransmission
authorPaolo Abeni <pabeni@redhat.com>
Thu, 27 May 2021 23:31:37 +0000 (16:31 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 28 May 2021 20:51:39 +0000 (13:51 -0700)
commitb5941f066b4ca331db225a976dae1d6ca8cf0ae3
treeb6fa9bcf8c7680ae478f77f611f2fcf94df7cc13
parent44991d61aa120ed3e12f75bb0e0fbd2a84df930d
mptcp: fix sk_forward_memory corruption on retransmission

MPTCP sk_forward_memory handling is a bit special, as such field
is protected by the msk socket spin_lock, instead of the plain
socket lock.

Currently we have a code path updating such field without handling
the relevant lock:

__mptcp_retrans() -> __mptcp_clean_una_wakeup()

Several helpers in __mptcp_clean_una_wakeup() will update
sk_forward_alloc, possibly causing such field corruption, as reported
by Matthieu.

Address the issue providing and using a new variant of blamed function
which explicitly acquires the msk spin lock.

Fixes: 64b9cea7a0af ("mptcp: fix spurious retransmissions")
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/172
Reported-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net>
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>
net/mptcp/protocol.c