Commit 53eb4c38 authored Jul 23, 2020 by Paolo Abeni Committed by David S. Miller Jul 23, 2020

mptcp: avoid data corruption on reinsert



When updating a partially acked data fragment, we
actually corrupt it. This is irrelevant till we send
data on a single subflow, as retransmitted data, if
any are discarded by the peer as duplicate, but it
will cause data corruption as soon as we will start
creating non backup subflows.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Tested-by: Christoph Paasch <cpaasch@apple.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b0977bb2

net/mptcp/protocol.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -460,15 +460,20 @@ static void mptcp_clean_una(struct sock *sk)

		dfrag = mptcp_rtx_head(sk);
		if (dfrag && after64(snd_una, dfrag->data_seq)) {
		u64 delta = dfrag->data_seq + dfrag->data_len - snd_una;
		u64 delta = snd_una - dfrag->data_seq;

		if (WARN_ON_ONCE(delta > dfrag->data_len))
		goto out;

		dfrag->data_seq += delta;
		dfrag->offset += delta;
		dfrag->data_len -= delta;

		dfrag_uncharge(sk, delta);
		cleaned = true;
		}

		out:
		if (cleaned) {
		sk_mem_reclaim_partial(sk);

Admin message