From nobody Wed Jun 24 17:14:28 2026 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 CC61D313E03; Fri, 1 May 2026 19:36: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=1777664174; cv=none; b=klET86R8Q+LAO90DMUrRiFOz/nSYic3ZMaHJTxSIDBzHzZBfWz2k1ADDtRAzzWDzpvvTWdV+n1uUkxkbds7YbC5qoOa4rE8vxQ/lMMWEtehmIpd0OKLToyiaGNSUaqnpHKo/V5FscElDnOnuLxCb6cpcCWN/OAHebSfbUSXyVt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777664174; c=relaxed/simple; bh=CQeKDnYHzNPI+8C7OhbDrXambHWvhF+m7w0D0trjZl8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=POoGR9kSGunNxnCji8GhJ0W/5QzqB6fa69xDsvwSNCcm8Hl5Mj5CSf6JZFcBgPD43khQhCn3XvfFs0UHbr6VOOWqLaXIQpIs3BYcT4z3okalC5CqRlPdT7U6JqnshjeHN3rJLJxzuALVlcnLWLpQyhfvOeaayTaskhG+xqMHRAU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T1gCfSix; 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="T1gCfSix" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3EE2C2BCC4; Fri, 1 May 2026 19:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777664174; bh=CQeKDnYHzNPI+8C7OhbDrXambHWvhF+m7w0D0trjZl8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=T1gCfSixFK2RXXrkTgYrFx3MZRiOvOxB6efXmuIgUZsD4CffpIRD2ag2U/oXa2qDT tPuxGAXsZ1HqT6s+S/TWMEyUx5wnC1QNh8VdHLsvDQFElg8pbY8nTRCrUpafkKhIWu OO6E8GuhWel8Zj825eDmsBxNrVrlGadH6kBSNvAT2FCMp1W2ind1zO1g0CJa9+UkiY Z+GDAgNM3g8TN7pTM/lLM9QuUKI6Kb4Y2jR3mSEIEWTDJdQQzXAHGzSgIKL+xSDgWP MMEMSunTscSFNJ5TeJ4nNKuP3vsVlqw62i78tNTaG+BNqKJtoD13oILuhbkMOaVACw ao57+EtVktbkA== From: "Matthieu Baerts (NGI0)" Date: Fri, 01 May 2026 21:35:34 +0200 Subject: [PATCH net 1/4] mptcp: use MPJoinSynAckHMacFailure for SynAck HMAC failure Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260501-net-mptcp-misc-fixes-7-1-rc3-v1-1-b70118df778e@kernel.org> References: <20260501-net-mptcp-misc-fixes-7-1-rc3-v1-0-b70118df778e@kernel.org> In-Reply-To: <20260501-net-mptcp-misc-fixes-7-1-rc3-v1-0-b70118df778e@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal , Gang Yan , Dmytro Shytyi Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Shardul Bankar , stable@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1540; i=matttbe@kernel.org; h=from:subject:message-id; bh=S3NhcQVoid/E4etRupkhrJemAOUzbf6PWUYaWnK4HP8=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK/Mixtu3j06MkokcuC66z3+eqJHNZpNW280/ZjwqWqi us+Lc9Wd5SyMIhxMciKKbJIt0Xmz3xexVvi5WcBM4eVCWQIAxenAEwkKJuR4bBbdeb7H73bysLV o/kOTW9Lb+z7vPbeRrFfTF3ODDN5MhgZnlz6uCUrvVzn1ooDaVlZ2y9MmXH/HsursvPpq79whVf m8AEA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Shardul Bankar 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) --- net/mptcp/subflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, con= st struct sk_buff *skb) subflow->backup); =20 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 =3D MPTCP_RST_EMPTCP; goto do_reset; } --=20 2.53.0