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 9A39D28D830; Wed, 23 Apr 2025 15:16:58 +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=1745421418; cv=none; b=JX61+xh7oJguti/DghEObrhnMYgo2/97C+Xt7auQ+4EzzBIQkqXFhtv561GUtM3Sbf2kPgM6N/1ULLJUFfMNh7bjsmDOqq7PHADN9akqLWZL/qJrKZPKZMi5hhb/HfHH3SbgJJSEBOu2MK4zkd0PeZXLvsZZF+cbMXnYWrvsetI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745421418; c=relaxed/simple; bh=gRN65z9o2OTizu9dpghXdeNVud/kn2XQKIHCWVZ/NnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qa8m0zFWMDOfj1wTe3sFWvxt9qp7YGPIcLnWY0QEP6tdmxiG0iFn4D8/SjDh+JJl6FTSsnDymwe+1EY1c0Gg3JcMlCtDML1mLBg04lUOY2hGZBuCBMjusLjZyD8VPdaaB6/YC+6nBYErGIsoJ1onle9hGkvkzsbtf2W8Kw5Om14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NVuQyT/M; 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="NVuQyT/M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04A02C4CEE2; Wed, 23 Apr 2025 15:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745421418; bh=gRN65z9o2OTizu9dpghXdeNVud/kn2XQKIHCWVZ/NnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVuQyT/MvazEW1PuU1ePMvNxteYltq18WN1todKkOBmn2SRFgWA0akShkGVK+BMUY Wizutsy6jsnnCPJGC5VrgctdcOuDembn6VetkDt8Xf96KotnV8+RUv65l/QEnxQ/GL 8OUlGBMC0aOWiZy2b18HoCeJhCMvSyLXvtAMXXb0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Geliang Tang , "Matthieu Baerts (NGI0)" , Simon Horman , Jakub Kicinski Subject: [PATCH 6.6 177/393] mptcp: only inc MPJoinAckHMacFailure for HMAC failures Date: Wed, 23 Apr 2025 16:41:13 +0200 Message-ID: <20250423142650.688124215@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 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: Matthieu Baerts (NGI0) commit 21c02e8272bc95ba0dd44943665c669029b42760 upstream. Recently, during a debugging session using local MPTCP connections, I noticed MPJoinAckHMacFailure was not zero on the server side. The counter was in fact incremented when the PM rejected new subflows, because the 'subflow' limit was reached. The fix is easy, simply dissociating the two cases: only the HMAC validation check should increase MPTCP_MIB_JOINACKMAC counter. Fixes: 4cf8b7e48a09 ("subflow: introduce and use mptcp_can_accept_new_subflow()") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250407-net-mptcp-hmac-failure-mib-v1-1-3c9ecd0a3a50@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/subflow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -877,12 +877,16 @@ create_child: goto dispose_child; } - if (!subflow_hmac_valid(req, &mp_opt) || - !mptcp_can_accept_new_subflow(subflow_req->msk)) { + if (!subflow_hmac_valid(req, &mp_opt)) { SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC); subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); goto dispose_child; } + + if (!mptcp_can_accept_new_subflow(owner)) { + subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); + goto dispose_child; + } /* move the msk reference ownership to the subflow */ subflow_req->msk = NULL;