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 EB5083EBF06 for ; Mon, 18 May 2026 13:46: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=1779111982; cv=none; b=ix5G58sQioyhbd8A82ba7NOD8XawAy6uy3w5jajeblikNWO81dlsNhrSnxytjuDmpleMSR8Y/mZ609Ptl8ohA2cNWwHMx4Xq7mptqrYKk+IsNRsPSuSFnZ3rzrJxAURWLjg1ycLiFU8Bue28IAP4CPs8L592/j7CYv6RULdWAl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779111982; c=relaxed/simple; bh=M7ROLbl/HLAhkq3tk929ARUUxv6oVQCqlQfuxJn5Owc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A6avczEfRB057BRZ0OyokK2ThQ497h00EFQqVniL+bzGcC06TVIaVyh7Yh9qCNa9NerXnGojS/c9nMBSNuZigLeMRtWMiyOkiNY0YecnoqhzC0r04pP11e2Sl3KMGjKWZI1DSqED+6JPB4q/A2GBIW4ezgiV/gvCJ35putEroaM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kyrr9xiW; 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="kyrr9xiW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC6D0C2BCB8; Mon, 18 May 2026 13:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779111981; bh=M7ROLbl/HLAhkq3tk929ARUUxv6oVQCqlQfuxJn5Owc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kyrr9xiWoWRgCTEKGyZJi4pgk70EBGzuOmOE5FhqIXBvXNh14bSRX1o9tE6gmr06h qkmdKqTLJxdpT0VakXf21Bp1WopbX6ICt3eEajnRLvLR0L+Hi3BVbUniz+ufpRAlzZ TmRzcz7qaSpSCGVUWj1ljXVUWc8lXDZIzGdcrdh9NURQc3WOc2f5RRkn9dD5VCvXvH ylGIOOyhZ8GkVC5lCky0ApcovVIV7h0gtZCwgS3oxplEaHqoSRRRx4EFJMocSC95ax 9YqnWpFxFkgFikL2b/tgLOXjVJJYB/E5sPl68woJ1IXDQqB01eEG12Lwgn/NU/fugI KyVqmEE/HWzAA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12.y] mptcp: pm: ADD_ADDR rtx: fix potential data-race Date: Mon, 18 May 2026 09:46:19 -0400 Message-ID: <20260518134619.1137523-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051215-palpable-domelike-c3d6@gregkh> References: <2026051215-palpable-domelike-c3d6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Matthieu Baerts (NGI0)" [ Upstream commit 5cd6e0ad79d2615264f63929f8b457ad97ae550d ] 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 [ applied hunk to `net/mptcp/pm_netlink.c` instead of `net/mptcp/pm.c` ] Signed-off-by: Sasha Levin --- net/mptcp/pm_netlink.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 3ac09bfe6e4b2..e920e77d2e1ec 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -307,6 +307,13 @@ static void mptcp_pm_add_timer(struct timer_list *timer) if (!entry->addr.id) 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; @@ -335,6 +342,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) mptcp_pm_subflow_established(msk); out: + bh_unlock_sock(sk); __sock_put(sk); } -- 2.53.0