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 A0BBF421884; Mon, 27 Apr 2026 19:54:49 +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=1777319689; cv=none; b=aGevqq5eiFooj7p2BKIscT7+aYATwFGdhZnhvZeGcjPlil4dT6Fn+sSah0lw+IzK/BAc9xtCY7AGqf9ntvzl2FA83ulGWlmLzY7U6efLvOXvS4dPBLmWJ7jNQHiuq2U4r+q6FY/o4cTjcv5CPwfYR/tKRX0rIBQmEgXeySLc1VU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777319689; c=relaxed/simple; bh=LBn2LgMBcaDvs+3DQCdYAOSmTIOssdPu+zqCDPnZfYU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oBVHjDby8j2a/6ivaApoRL+DbsVQmLWf+Jb+Nkeha3aerNfG+HOaXWjx41Qm9JtBkfJNjKZ8g2RSjGpJsehbQbcR0J/tGaAznACdtxpADRJZforgMHUHz1kRwlQ5G5ObWmL+PuaknNDuhQLVoYab4MEVWPIqbGfT458xShSOwDw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ttam2fPc; 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="Ttam2fPc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC03BC2BCB5; Mon, 27 Apr 2026 19:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777319689; bh=LBn2LgMBcaDvs+3DQCdYAOSmTIOssdPu+zqCDPnZfYU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ttam2fPcoBMOcF7zUTYQEtrxmuuFMgQ+CWINYqTNwWaSSsdLgf19gHimnr9y1XQfx ccvSC25fyqk3hQzW4nkgeUWC25RPNhv3oevjgr3l2jv+RyEGAAnqyROa1OWO/hZ4O6 eb0IK80HIuNWPiZmoie4SjRoBgtzyx+o3GCxDLmxbJIaruPVMmRqLFMPUctVGyueEp uyO8OUAlYyqV7Wd9ZnXyh30AVwCVU6uOMPRuot69eLvClHapo0ZdtlXkKplt04DVlR PrVNOSWsT+E3JBfHRdASHIJBKZrBCmb7oryFC/CsGUFyQqG+R0oqR/XZZr1NoWqrgW 24cgVW630a6vQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 Apr 2026 21:54:34 +0200 Subject: [PATCH net 2/4] mptcp: fix scheduling with atomic in timestamp sockopt Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260427-net-mptcp-misc-fixes-7-1-rc2-v1-2-7432b7f279fa@kernel.org> References: <20260427-net-mptcp-misc-fixes-7-1-rc2-v1-0-7432b7f279fa@kernel.org> In-Reply-To: <20260427-net-mptcp-misc-fixes-7-1-rc2-v1-0-7432b7f279fa@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Gang Yan , stable@vger.kernel.org, Sashiko X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1719; i=matttbe@kernel.org; h=from:subject:message-id; bh=iBK9QVv4IIxXvqP2wcnH/vp4xvbK4EmPyg+nC3HMa4c=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLf7/u/Sd1Hn+HKdYUf73Rcux49N2vQuHJGUnVv0aa3K wuuThDV6ShlYRDjYpAVU2SRbovMn/m8irfEy88CZg4rE8gQBi5OAZjIMV6G/0k7Tpk87Du256up wq3St2Wha5m6qhvu2GtoikWtmsSc9ZjhfxXD3v2FBw85LfZdxKk2d9neDxqpqxv4Vj5OmdDyYJX ZbEYA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Gang Yan Using lock_sock_fast() (atomic context) around sock_set_timestamp() and sock_set_timestamping() is unsafe, as both helpers can sleep. Replace lock_sock_fast() with sleepable lock_sock()/release_sock() to avoid scheduling while atomic panic. Fixes: 9061f24bf82e ("mptcp: sockopt: propagate timestamp request to subflows") Cc: stable@vger.kernel.org Reported-by: Sashiko Closes: https://sashiko.dev/#/patchset/20260420093343.16443-1-gang.yan@linux.dev Signed-off-by: Gang Yan Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/sockopt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 79db15903e7a..0efe40be2fde 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -159,10 +159,10 @@ static int mptcp_setsockopt_sol_socket_tstamp(struct mptcp_sock *msk, int optnam lock_sock(sk); mptcp_for_each_subflow(msk, subflow) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); - bool slow = lock_sock_fast(ssk); + lock_sock(ssk); sock_set_timestamp(ssk, optname, !!val); - unlock_sock_fast(ssk, slow); + release_sock(ssk); } release_sock(sk); @@ -235,10 +235,10 @@ static int mptcp_setsockopt_sol_socket_timestamping(struct mptcp_sock *msk, mptcp_for_each_subflow(msk, subflow) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); - bool slow = lock_sock_fast(ssk); + lock_sock(ssk); sock_set_timestamping(ssk, optname, timestamping); - unlock_sock_fast(ssk, slow); + release_sock(ssk); } release_sock(sk); -- 2.53.0