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 1DF5D3B4404 for ; Tue, 12 May 2026 14:19:25 +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=1778595565; cv=none; b=tdqeSI/P3hkENIyTOFNdKB5HEih+ZZ6AY+4SltT0RkFSFEj8Mvltrvpa6B8OENArlw71Uf2RLLMazfmsRBTJCFhsGkRZy1dVGjuRKtOm7gQzhchrGA2vOPZCLkA/DUe2ebpd1RNJl1/rH3ujLerNBVZrbXbrNhvqXXSyWWpteco= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595565; c=relaxed/simple; bh=Z1fRVZKHw2Em7TWSDGfQUMfqQyFrGvL5DMnowUDgx98=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=rHVEJbrzwr5WwjkNPKYMeAjADy8tKbNq1MZ9RUHygBRUDhgJPlLKWzKmyai1vxj+1s7wWINraXyRgld0RB+wk5YF2OUpnjI+1JOpbleVcbJ2JFxpfRtkoHFc6HWhDah2HUxXFUxVxJub6j7brFp2ynaeWpo/v1kwkpIQWqMGFRc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Oshxsd4B; 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="Oshxsd4B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2BD8C2BCB0; Tue, 12 May 2026 14:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595565; bh=Z1fRVZKHw2Em7TWSDGfQUMfqQyFrGvL5DMnowUDgx98=; h=Subject:To:Cc:From:Date:From; b=Oshxsd4BMO7dtgYcQTD5ndARTBkSUDjUFyJdYSqdm5czLAC1inbyCWM9xjAh2wbmq H3NhzuxyL1xTtLgnYl6B5yO/onuMnZq11MLhd/U472oGCzcUZhworLZV06WBl25+bM 7SdUtF1uiIaHE+zoXHDaFJDn3wEEyEJNwbAh6VnY= Subject: FAILED: patch "[PATCH] mptcp: use MPTCP_RST_EMPTCP for ACK HMAC validation 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:29 +0200 Message-ID: <2026051229-luster-debtor-8bf2@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 a6da02d4c00fdda2417e42ad2b762a9209e6cc49 # git commit -s git send-email --to '' --in-reply-to '2026051229-luster-debtor-8bf2@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a6da02d4c00fdda2417e42ad2b762a9209e6cc49 Mon Sep 17 00:00:00 2001 From: Shardul Bankar Date: Fri, 1 May 2026 21:35:35 +0200 Subject: [PATCH] mptcp: use MPTCP_RST_EMPTCP for ACK HMAC validation failure When HMAC validation fails on a received ACK + MP_JOIN in subflow_syn_recv_sock(), the subflow is reset with reason MPTCP_RST_EPROHIBIT ("Administratively prohibited"). This is incorrect: HMAC validation failure is an MPTCP protocol-level error, not an administrative policy denial. The mirror site on the client, in subflow_finish_connect(), already uses MPTCP_RST_EMPTCP ("MPTCP-specific error") for the same kind of HMAC failure on the SYN/ACK + MP_JOIN. Use the same reason on the server side for symmetry and accuracy. Suggested-by: Matthieu Baerts (NGI0) Fixes: 443041deb5ef ("mptcp: fix NULL pointer in can_accept_new_subflow") 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-2-b70118df778e@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index bda6862264ca..d562e149606f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -908,7 +908,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, if (!subflow_hmac_valid(subflow_req, &mp_opt)) { SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC); - subflow_add_reset_reason(skb, MPTCP_RST_EPROHIBIT); + subflow_add_reset_reason(skb, MPTCP_RST_EMPTCP); goto dispose_child; }