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 EC8623DD86B; Tue, 12 May 2026 17:48:38 +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=1778608119; cv=none; b=t8R/hWDtYmHrg2OvpezOcqJEqBlBGK77FNgvaUYjHMGfnNYE/W+AIgR9TB5wizZ7zUnyhUD5Ijm7twvB3bPT57J56O7KDI3v7NZ/e4ZPMhKjy0x2CgUx/2t8GGeB5yWkB6FSJzFvewFYpfIJqj/pRi0Mwh4Wx1/J5JD+u7ApXFA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608119; c=relaxed/simple; bh=hjoG7+F0fS4RZ9nTuy+AOZSPAQzp3EQehGnJt3CHMjM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPtpnwrFuwtupqZNpUOEsSnOQsGv0sI9yYO+HXtkv/+uknh5AKVezjoAqInuWw7nxt/fQ0KEw9NL1y6uWBhIfrjZa1ylmCwJ1kQ5Xxpx0XSRszraY/huXoYg1KTcZo41KMvEkJsOU4XetsfHdP+/M1jCqvJrFJl43jEOtcS/twY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oX2//S/i; 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="oX2//S/i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8233AC2BCB0; Tue, 12 May 2026 17:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608118; bh=hjoG7+F0fS4RZ9nTuy+AOZSPAQzp3EQehGnJt3CHMjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oX2//S/iy/0p/MhOPacNltpHa9t7UQgyQrXTSdZnYYm/vx2Yd1F6+KGmKDnGysRcg F0v4Yvc+hhyxpOaMIT0D/yP5+/GeBIkfYBIYHOH3HpZUQ7bkB8HqLIrk8lzW2xYEGZ 36VIMaBVDhuCzvypHkzFB0+05WbH4cketWLzGB8c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Gang Yan , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.12 163/206] mptcp: fix scheduling with atomic in timestamp sockopt Date: Tue, 12 May 2026 19:40:15 +0200 Message-ID: <20260512173936.315813956@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173932.810559588@linuxfoundation.org> References: <20260512173932.810559588@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gang Yan commit b5c52908d52c6c8eb8933264aa6087a0600fd892 upstream. 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) Link: https://patch.msgid.link/20260427-net-mptcp-misc-fixes-7-1-rc2-v1-2-7432b7f279fa@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/sockopt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -159,10 +159,10 @@ static int mptcp_setsockopt_sol_socket_t 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_t 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);