From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDCED3F6C4C for ; Mon, 18 May 2026 11:48:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779104905; cv=none; b=stpnVwYWn4TPh7bqzrz+a2R0rGtFkcZIBdnn4qIrJK6bM+oTalIB2HvV4yah8Tuv2UtcG1+DxaUxYRJSAaGY1TBUSrEhCLnOAHPVl3Bg4b1oe6pR9ZRyc2FsAkJt6F1B8igo/FBzFUkONgxrXldgnkUX7hxGc936KORqUOSVdVc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779104905; c=relaxed/simple; bh=8BN0YY1glHtubrZGcjDiNGU56ffEiAJ0+exhqDrOfbA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dMmCuMBSkLpvbGO0S2Uq90pE+ojlnjuUt5UGPmccnReITVSWLePgh4AzBGmKjbQUvKICp7Fq20MhJ8u+7gaq4hyw2fsk89ovEQP6JEbYjUa4IyJPekx8h/n8nFKTE3cFwuEEdVGfyRedVpcroEl9bhlrJSZFH1HyRWPjbvxwvBE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G4PvD4Uj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G4PvD4Uj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EB5EC2BCC7; Mon, 18 May 2026 11:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779104905; bh=8BN0YY1glHtubrZGcjDiNGU56ffEiAJ0+exhqDrOfbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G4PvD4UjDj+F0OTTZx/uXiWTCSw6VrNysRrd63kKvJf806ZKKOq+uDsfsrE7HgR9G Uv+EY9EMP2HzkMgakPNQk10qx+tLdpLhE3wAT3ccekJRVVrXcitfGvbrHSJW2bUX07 sNx6Qhw0oWgJOheFQBGBL1dqDz+dNkJ6BVHituc0B+o54ZIylEddCDUbAIDV4yah1v 3qYmsqVyKw63zAoJ+saKol6t1SzvMKPOZJFw2xte4vNtFDBB+GVomD3QAl5Rt8lTb8 tnC4WrnoGBAamwMI0bv2ikIKO/Jrq4cBKisSyi5RTuU8/XnRxI7dkGnRZPqyP7Wrxh Db2IBXEtI0wsQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Paolo Abeni , "Matthieu Baerts (NGI0)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12.y 2/2] mptcp: fix rx timestamp corruption on fastopen Date: Mon, 18 May 2026 07:48:22 -0400 Message-ID: <20260518114822.789572-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260518114822.789572-1-sashal@kernel.org> References: <2026051256-flinch-galley-b789@gregkh> <20260518114822.789572-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Paolo Abeni [ Upstream commit 6254a16d6f0c672e3809ca5d7c9a28a55d71f764 ] The skb cb offset containing the timestamp presence flag is cleared before loading such information. Cache such value before MPTCP CB initialization. Fixes: 36b122baf6a8 ("mptcp: add subflow_v(4,6)_send_synack()") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260501-net-mptcp-misc-fixes-7-1-rc3-v1-3-b70118df778e@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/mptcp/fastopen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c index 7777f5a2d1437..d4dbdd3d5679d 100644 --- a/net/mptcp/fastopen.c +++ b/net/mptcp/fastopen.c @@ -12,6 +12,7 @@ void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subf struct sock *sk, *ssk; struct sk_buff *skb; struct tcp_sock *tp; + bool has_rxtstamp; /* on early fallback the subflow context is deleted by * subflow_syn_recv_sock() @@ -39,12 +40,13 @@ void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subf */ tp->copied_seq += skb->len; subflow->ssn_offset += skb->len; + has_rxtstamp = TCP_SKB_CB(skb)->has_rxtstamp; /* Only the sequence delta is relevant */ MPTCP_SKB_CB(skb)->map_seq = -skb->len; MPTCP_SKB_CB(skb)->end_seq = 0; MPTCP_SKB_CB(skb)->offset = 0; - MPTCP_SKB_CB(skb)->has_rxtstamp = TCP_SKB_CB(skb)->has_rxtstamp; + MPTCP_SKB_CB(skb)->has_rxtstamp = has_rxtstamp; MPTCP_SKB_CB(skb)->cant_coalesce = 1; mptcp_data_lock(sk); -- 2.53.0