Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056818; b=giHG3akP5h0h2jVT1Y7p5xKgOx1NmVEWV6xzFsUpLdw2lUh5mxDz7aLdi+8cw4DMLiya 4/CBrHp0i+oxwahz/eokyuQoqCQsCkyiPBw2djsvDAh+FGszdOV2HYTA8xdASC/606qRb bh64oflNUDimbilPbcduzjVw/28M9ZeFhezexk8uLeYqtEtxi022GQzylNDXeWgi84/La F+KHoRFbH94/TfsXTiEmfN5GqZymA8w69S/LcNQCq6EDLxF9pEEPBe4E+b6SZXqhXZ69y vL8S9ZHccfo9WAQp9TGywWJtj+HuTtJgWFT1DahuHAH84Uy/lluGX3/CkyuE5SGA2Qg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056818; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=BDJNFI453z5igTqzve1GP76gyzWU+pj2ANWaqYV46zw=; b=mAd14BMEI8jXvFtH5xfm51NQjGnWAziqCswHoupTSfhhdaXulwjU5bpjDWXv7pO0p6Ko IOBekAYkOeD6DK3hcFbv7mnJq/I1xJ2jWnmACX2SHaS2PYgZzv7twufaKFBoZaeEBjRre EUg5fZh+LqPntWzggLW1+qJ9f3F3bTBg2RdQj2lAwGPSex4lpxcrrhvaF5fQUcfuCpDHn qqE1Q4cMOob7++Q69BwMUY8xri7MojUfSP47RwSEQ1xGSpGlEVEisq2+ka9CeY2omL+p0 +H7QirVN+R/3S7RAdv7teoK/RKfwMfgDeeMp7vdkOrQ4g73YXHbZ/HX1/BpdTYcWNMQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=HzFH0eSy; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94A92606A325; Thu, 19 Nov 2026 02:53:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=HzFH0eSy Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC1401F000C4; Thu, 19 Nov 2026 02:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056818; bh=BDJNFI453z5igTqzve1GP76gyzWU+pj2ANWaqYV46zw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HzFH0eSyCRqSkJ2drqCnADyqncVZtcAjX6AGZJkuRarQ4ppwDibC87qRf750vjCiF HwTyISt29mCIHvXh+n5roQIhp7tHIxNfr2XaNKICPBd3RN1y6OQZc43UToECzwRtF7 gIvwMtUK0PwFQmYlQl56ZaIlTo41M95xBoEFKbA0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cen Zhang , Andrew Morton , Joseph Qi , Mark Fasheh , Joel Becker , Kees Cook , Jakub Kicinski , Kurt Hackel , Jia-Ju Bai , jjzuming@gmail.com, Sasha Levin Subject: [PATCH 5.15 2082/2214] ocfs2: initialize status waiters before publishing them Date: Wed, 18 Nov 2026 16:02:38 +0100 Message-ID: <20261118150133.929345804@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cen Zhang [ Upstream commit f6bfa6c458288d72948af95391b205f3eb775721 ] o2net_prep_nsw() publishes its stack waiter in nn_status_idr and nn_status_list under nn_lock, then initializes the wait queue and completion status after releasing the lock. A concurrent disconnect can find that waiter through o2net_complete_nodes_nsw() and call wake_up() before the wait queue has a valid lock and list head. The sender can also overwrite a completion status with its initial value. Initialize the wait queue and status before publishing the waiter. nn_lock then orders publication against completion, and no reader can observe a partially initialized object. Leave the IDR allocation and its failure handling unchanged. A controlled case-modified test kernel used a synthetic connection to enter the real send path and overlap publication with disconnect. The candidate completion and wake-up code were unchanged. Its Oops includes: KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:__wake_up_common+0xa0/0x1f0 Call Trace: __wake_up+0x36/0x60 o2net_complete_nsw_locked+0x222/0x370 o2net_set_nn_state+0x917/0xea0 o2net_disconnect_node+0xd0/0x190 o2net_validate_control_write+0x454/0x500 full_proxy_write+0x11f/0x180 vfs_write+0x25a/0x1010 ksys_write+0x111/0x200 do_syscall_64+0x114/0x620 entry_SYSCALL_64_after_hwframe+0x77/0x7f Modules linked in: Link: https://lore.kernel.org/pm-ocfs2-objects-candidate-0066-v1-437a0422801b292a2879@gmail.com Fixes: 98211489d414 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") Signed-off-by: Cen Zhang Signed-off-by: Andrew Morton Reviewed-by: Joseph Qi Assisted-by: LLM Cc: Mark Fasheh Cc: Joel Becker Cc: Kees Cook Cc: Jakub Kicinski Cc: Kurt Hackel Cc: Jia-Ju Bai Cc: Signed-off-by: Sasha Levin --- fs/ocfs2/cluster/tcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index edc2976aa3c56..3558bbdb5bff4 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -293,6 +293,11 @@ static int o2net_prep_nsw(struct o2net_node *nn, struct o2net_status_wait *nsw) { int ret; + /* Initialize all completion-visible state before publishing the waiter. */ + init_waitqueue_head(&nsw->ns_wq); + nsw->ns_sys_status = O2NET_ERR_NONE; + nsw->ns_status = 0; + spin_lock(&nn->nn_lock); ret = idr_alloc(&nn->nn_status_idr, nsw, 0, 0, GFP_ATOMIC); if (ret >= 0) { @@ -303,9 +308,6 @@ static int o2net_prep_nsw(struct o2net_node *nn, struct o2net_status_wait *nsw) if (ret < 0) return ret; - init_waitqueue_head(&nsw->ns_wq); - nsw->ns_sys_status = O2NET_ERR_NONE; - nsw->ns_status = 0; return 0; } -- 2.53.0