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 3345D3B2D0B for ; Tue, 12 May 2026 14:19:14 +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=1778595554; cv=none; b=NDaiEpTUDmNnLZB0lwFswuXgUfiWbpT/shM8mqkm3B8L+IhfORtT/9ZIXWPwcl3P0Fs6zDOWaIiG1JlcUsURqAN3S4+7QMw5RW62fzBNlx548WYQavsluwNRTcW/4qXYzvKzlCLTHLmGN1BL4TCMMU2QKQCTa1pGbYwp/xQ99u8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595554; c=relaxed/simple; bh=a5QUoLNdO75WWHwSNktP9q8LFz3vcYueEom1VHosx8c=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=dzWiuyP7sxCOHc0cfqQ+ZhwtBFcoV0vtIqLOlY9MQb2S450MatzCk3yo5SgF6m/B58LveBGvs9d9zlCDx2KrUDhEKZwt3mFFH7M3RdsImxB0IrqRHnzJyk7mSYn5mN1wXPbQPn0Yfy1uw/HqaezTPCBjsIbrXuWelsYhE2Qb6go= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hDO6Ynlb; 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="hDO6Ynlb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9353C2BCF5; Tue, 12 May 2026 14:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595554; bh=a5QUoLNdO75WWHwSNktP9q8LFz3vcYueEom1VHosx8c=; h=Subject:To:Cc:From:Date:From; b=hDO6YnlbrNkZQlTA6XsQTSHb0JMkxvofIhqef7ix8M6HWj63BT386rn6UJJTciFY0 wl43UDgsWAo1wx4fJ6u6Q3nuKc1Jt2ifAE/w6sQ/8k8QmH8/szSfZi18bKf9Ug4LB/ FhDIqcDs8H+i8sT+drzVR2BI2LhdZTkjBq42JWsI= Subject: FAILED: patch "[PATCH] mptcp: use MPJoinSynAckHMacFailure for SynAck HMAC failure" failed to apply to 5.10-stable tree To: shardul.b@mpiricsoftware.com,kuba@kernel.org,matttbe@kernel.org Cc: From: Date: Tue, 12 May 2026 16:19:18 +0200 Message-ID: <2026051218-paging-duct-8343@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 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x c4a99a921949cddc590b22bb14eeb23dffcc3ba6 # git commit -s git send-email --to '' --in-reply-to '2026051218-paging-duct-8343@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c4a99a921949cddc590b22bb14eeb23dffcc3ba6 Mon Sep 17 00:00:00 2001 From: Shardul Bankar Date: Fri, 1 May 2026 21:35:34 +0200 Subject: [PATCH] mptcp: use MPJoinSynAckHMacFailure for SynAck HMAC failure In subflow_finish_connect(), HMAC validation of the server's HMAC in SYN/ACK + MP_JOIN increments MPTCP_MIB_JOINACKMAC ("HMAC was wrong on ACK + MP_JOIN") on failure. The function processes the SYN/ACK, not the ACK; the matching MPTCP_MIB_JOINSYNACKMAC counter ("HMAC was wrong on SYN/ACK + MP_JOIN") exists but is not incremented anywhere in the tree. The mirror site on the server, subflow_syn_recv_sock(), already uses JOINACKMAC correctly for ACK HMAC failure. Use JOINSYNACKMAC at the SYN/ACK validation site so each counter reflects the packet whose HMAC actually failed. Suggested-by: Matthieu Baerts (NGI0) Fixes: fc518953bc9c ("mptcp: add and use MIB counter infrastructure") Cc: stable@vger.kernel.org Signed-off-by: Shardul Bankar 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-1-b70118df778e@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index e2cb9d23e4a0..bda6862264ca 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -581,7 +581,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->backup); if (!subflow_thmac_valid(subflow)) { - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINACKMAC); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNACKMAC); subflow->reset_reason = MPTCP_RST_EMPTCP; goto do_reset; }