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 6D55B22FF22; Fri, 15 May 2026 16:08:47 +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=1778861327; cv=none; b=MKu/oY506SAF4ahaAgWZxQpkLh07XjAZUe3enuSdOjrkMVXBmMBx8ShOoXgcQWzLHmYAbNWr3Abi/jpLAStGvZbvRT0m8Q3qnTfIVIV2YxvyAs7E59wiYWCeZcxelQvljBNoaVg5kCxS8obvkAnWcNBxQh7Flrl726cYb0cLJs8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861327; c=relaxed/simple; bh=AindjCwuE7Y5F2p9IrbZnQYjWK9UI/3SipneppN3A/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TbCzLZx12JPqBU4Ml1KWChOnrUihJb2xtAmVXvxy/FJ5jhvlOvjVx7ukrXakfSLe8g6S7tvPitSwwinGWfTaPwSTwzicWgquI5jjugEbqqIDFhCrZA6fMw/+y0TFvqx3jDYWG7CN3onNjnlJ4sWoJ0LA+Kv+kzr+2ioHf6rmYu0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=orJBz5Va; 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="orJBz5Va" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02B8DC2BCB0; Fri, 15 May 2026 16:08:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861327; bh=AindjCwuE7Y5F2p9IrbZnQYjWK9UI/3SipneppN3A/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=orJBz5VaIYeqPD/Gu4YiySi5CNr8xCPVaalNXF8z88AaEkA/+7pc4gXrVyTzNvvUs e7d00pCArkJ28h8WEyYGL2lZE6OJT9pd1jUGHAOKEkrZcCrJXk4sp7VrrVxG2pKFTR tyXL4ItOT+3fJ9I2SIC4j8h8gvmez5YOEsSJGjlM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Matthieu Baerts (NGI0)" , Shardul Bankar , Jakub Kicinski Subject: [PATCH 6.6 284/474] mptcp: use MPJoinSynAckHMacFailure for SynAck HMAC failure Date: Fri, 15 May 2026 17:46:33 +0200 Message-ID: <20260515154721.147120187@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shardul Bankar commit c4a99a921949cddc590b22bb14eeb23dffcc3ba6 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- net/mptcp/subflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -558,7 +558,7 @@ static void subflow_finish_connect(struc 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; }