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 389AB3AEB26 for ; Tue, 12 May 2026 14:20:00 +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=1778595600; cv=none; b=po7HzEp28BAknlojEMpmwGFDS+c0M9WIQKbxiW21hy5EW9nHofl9/OY0++Hv2WsUam0LwdOO4ex4i5w5t3KDNgdfXYrySz5VVpG4e0bK6UQsgC7n17GACdwL0JP9j4iWklghvVCQdVjFa8pllWKymGHlg3nVTDS82Yz9CgT7glw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595600; c=relaxed/simple; bh=RAhq7/Dju4W85/HRM55RU3Y5ojirpT5GfonRhciOJLw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=gDL3wyMYij/isXFnvbUDbrdzBcfOX4BZuEgV+ey1PdAiTSoH7t88VXo+4E6TcQaW7QuwkQU8KC1k/1eg0qMQj78BCeiw4VwtJbfHUUYhoocu26AvXzrxvhYViCZxySSpG0RvLwxutfi8HnCDc1dwiNLMJX5uHDfiS0v2mvq6Jfc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VaAX4ZWz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VaAX4ZWz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC497C2BCB0; Tue, 12 May 2026 14:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595600; bh=RAhq7/Dju4W85/HRM55RU3Y5ojirpT5GfonRhciOJLw=; h=Subject:To:Cc:From:Date:From; b=VaAX4ZWzVp4K7km7r7NdgyePbqlZPFoK1n83vtzEkD7+Yd2yPXJP2pPgQM5Ywl6L7 Ac6Y158IK7CNWvm9qBXkvxbqopq6zNJdQPEbEL1E4FSvwkR0RXU8nveLixsXsUzDxc c25G7pT91l9ki0dWkhgE6Yct0U0cUNMs+CR5x9k4= Subject: FAILED: patch "[PATCH] mptcp: fix rx timestamp corruption on fastopen" failed to apply to 6.6-stable tree To: pabeni@redhat.com,kuba@kernel.org,matttbe@kernel.org Cc: From: Date: Tue, 12 May 2026 16:19:56 +0200 Message-ID: <2026051256-grime-usual-23e7@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 6254a16d6f0c672e3809ca5d7c9a28a55d71f764 # git commit -s git send-email --to '' --in-reply-to '2026051256-grime-usual-23e7@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6254a16d6f0c672e3809ca5d7c9a28a55d71f764 Mon Sep 17 00:00:00 2001 From: Paolo Abeni Date: Fri, 1 May 2026 21:35:36 +0200 Subject: [PATCH] mptcp: fix rx timestamp corruption on fastopen 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 diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c index 82ec15bcfd7f..082c46c0f50e 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() @@ -40,12 +41,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);