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 1C2E839989D for ; Tue, 12 May 2026 14:21:21 +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=1778595681; cv=none; b=GLGK4AwniP/mgUrjBR+HsRqqajttzo8nsNmhcamMA5prkMxP9e4MmoTIR8wCup7lrYeEnO9jDT79KGFmd5+//lnxQSG1RvCpzXgH7zHkPtmYfXWr+9Rmn3ExPitaUE1zDtQvqMot0LJ/GO/GiqgWBsyWMC3GFRDyNg69iT2qe4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595681; c=relaxed/simple; bh=PvRWjvqh+KMF6sJJRVROiWJJgrZi+UnhouGN1liC3Ig=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=sfVAE+/F65tnGstCVcg6q8WpTZq7V2okdq+if+6rbqaIXy2TAthsJrGX5D6Yx6KW8L+d70bFHarryFuwEKDlp4JB6cnige4BFU+u+QcULgtmeS2awOqpkj4AjOaPDdvSZTksegS2OuS2BjJhr0uulAfJ4tZ03oaDfSracUXLbxE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W9Zpa+Nu; 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="W9Zpa+Nu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8FAEC2BCB0; Tue, 12 May 2026 14:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595681; bh=PvRWjvqh+KMF6sJJRVROiWJJgrZi+UnhouGN1liC3Ig=; h=Subject:To:Cc:From:Date:From; b=W9Zpa+NunJx8T9S8xzwxb9xdFGlm/vIBxNfe7U5dEOq7yNOOQdpPkGoplsvJH10X9 Zbdo3Tm+/prYB+rUjdBAXcVNeIIoAVver8cL6Tfs2mLRidz5HYUVFPcVXgUUH2J/B9 1OgjkMHmhTAAd3jaHjiWX2CVScTSWBY7Av7zyNiA= Subject: FAILED: patch "[PATCH] mptcp: pm: ADD_ADDR rtx: fix potential data-race" failed to apply to 6.1-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Tue, 12 May 2026 16:21:15 +0200 Message-ID: <2026051215-bacon-cartoon-33fb@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 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x 5cd6e0ad79d2615264f63929f8b457ad97ae550d # git commit -s git send-email --to '' --in-reply-to '2026051215-bacon-cartoon-33fb@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5cd6e0ad79d2615264f63929f8b457ad97ae550d Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 5 May 2026 17:00:51 +0200 Subject: [PATCH] mptcp: pm: ADD_ADDR rtx: fix potential data-race This mptcp_pm_add_timer() helper is executed as a timer callback in softirq context. To avoid any data races, the socket lock needs to be held with bh_lock_sock(). If the socket is in use, retry again soon after, similar to what is done with the keepalive timer. Fixes: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-3-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 5056eb8db24e..3912128d9b86 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -337,6 +337,13 @@ static void mptcp_pm_add_timer(struct timer_list *timer) if (inet_sk_state_load(sk) == TCP_CLOSE) return; + bh_lock_sock(sk); + if (sock_owned_by_user(sk)) { + /* Try again later. */ + sk_reset_timer(sk, timer, jiffies + HZ / 20); + goto out; + } + if (mptcp_pm_should_add_signal_addr(msk)) { sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8); goto out; @@ -365,6 +372,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) mptcp_pm_subflow_established(msk); out: + bh_unlock_sock(sk); __sock_put(sk); }