From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795028488; b=E2V6effHx2g/PPqbb1P8kSCiLAVDbnS+4fpXvIOZMncIcxCu+OX89UAxxMFf1CVUKdeJ GpUNoBNF30GX9D7+wVAUvwp54ajEcjqYACdZlIlSG9qsMU8IsEIJE7TUapPj6D67KUYxS h9awds+3OAyHlLU2ojy6GFBj/BzKrTZZVXJhY0GOJIFm3WzUmI3uWueY8gOYW+KZ3zjHv Gwoov2WvJshTX+/hevxjUOq2suRNOAYkFJxK+iLX4aQODoT/k3K59az+3MZ59rc0kT5AL pKccVWAGmM0Drz0OviFhk0GW6iEa3gqHLEUvWU7WTSnUU2aEwp1LueYdJolvbEe4EuQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795028488; 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=sxKbDSLjr2i5mwdUeoDqvm19QOwoBY26iWoS9lrp7tM=; b=l0ye46gHOKZh7Mro1cTP/ld4kW7LD4lF9cAuvehgDPCuxgHmMC922yQU1NdZvSZDC3cS DEn6cUdx0Q7S332Z+Me/kDp0Q/qkpnd0mxYGmG1/PkpP/k7bhqadanirRZfFdVkDvCDAd T9MtU2tDZZw0KXO891vzAPwZZIBl8/ufeG/0aR2l8EBQP0nlI4VG67+FogtF+kibDLI2C qj8wLAyi3UeV9kJNWWVPCKRf5HWb6Mgy3Rr+/UD+5aq+EFjcRohW/XEKJlOQ7NPW0qCf/ 966IMMJ/+PSZ3lHqJR2ZpOHbypAhdFuhiFqR86MoYvB9Vbc+1+unO6q723dbZ90r4hg== 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=FbrYRTZt; 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 A882D606A336; Wed, 18 Nov 2026 19:01:28 +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=FbrYRTZt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12B271F000C4; Wed, 18 Nov 2026 19:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795028488; bh=sxKbDSLjr2i5mwdUeoDqvm19QOwoBY26iWoS9lrp7tM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FbrYRTZtnbF0nh4nXbkkrbthCsimlUKWh5pVgqTO9Nuplu4Eh3iFFIYQNZwYmDjHQ GYNDgt+EXrwO8gKa0oh3fNAd+V+doj3omvOBsaTUXt8tlNRJrwgbYlg2lQsTXbSrHa utSr+QN2x23exDGdi3vvA8q0TZuWgfyLHAdPhVzI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Karl Mehltretter , Andrew Morton , Sashiko , Joseph Qi , Mark Fasheh , Joel Becker , Cen Zhang , Junxiao Bi , Heming Zhao , Sasha Levin Subject: [PATCH 6.12 0014/1756] ocfs2/cluster: hold a reference on the heartbeat thread Date: Wed, 18 Nov 2026 15:35:41 +0100 Message-ID: <20261118150008.520511046@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Karl Mehltretter [ Upstream commit aa2e38aabaae87236290e486a2b77cfa3adfbebe ] Since commit 688bc88e2046 ("ocfs2/cluster: keep heartbeat local node stable"), o2hb_thread() leaves its loop and returns when the local node changes, for example after "echo 0 > node//local". The thread was started with kthread_run() and nothing holds a reference to its task_struct, so the task is freed once it exits, while reg->hr_task still points to it. Reading the region's pid attribute then reads the freed task, and removing the region calls kthread_stop() on it: BUG: KASAN: slab-use-after-free in o2hb_region_pid_show+0xb3/0xc0 refcount_t: addition on 0; use-after-free. Oops: Oops: 0000 [#1] SMP KASAN NOPTI RIP: 0010:kthread_stop+0xb1/0x390 The thread could already return by itself before, when heartbeat start was aborted or on an unclean stop, but the local node change makes it reachable from userspace at any time. Create the thread, take a reference on it and only then wake it, so the reference cannot race with the thread exiting. Drop it with kthread_stop_put(). Link: https://lore.kernel.org/20260923010149.14391-1-kmehltretter@gmail.com Fixes: 688bc88e2046 ("ocfs2/cluster: keep heartbeat local node stable") Signed-off-by: Karl Mehltretter Signed-off-by: Andrew Morton Reported-by: Sashiko Closes: https://sashiko.dev/#/patchset/20260616074931.3774929-1-zzzccc427%40gmail.com Reviewed-by: Joseph Qi Assisted-by: LLM Cc: Mark Fasheh Cc: Joel Becker Cc: Cen Zhang Cc: Junxiao Bi Cc: Heming Zhao Stable-dep-of: 0a8f258c0f01 ("ocfs2/heartbeat: serialize concurrent writes to a region's dev attribute") Signed-off-by: Sasha Levin --- fs/ocfs2/cluster/heartbeat.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 94743cef12f13..c7fd2e5c2c0bf 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -1956,18 +1956,22 @@ static ssize_t o2hb_region_dev_store(struct config_item *item, atomic_set(®->hr_unsteady_iterations, (live_threshold * 3)); o2hb_set_region_stopping(reg, false); - hb_task = kthread_run(o2hb_thread, reg, "o2hb-%s", - reg->hr_item.ci_name); + hb_task = kthread_create(o2hb_thread, reg, "o2hb-%s", + reg->hr_item.ci_name); if (IS_ERR(hb_task)) { ret = PTR_ERR(hb_task); mlog_errno(ret); goto out; } + /* The thread may exit on its own, so pin it before it can run. */ + get_task_struct(hb_task); spin_lock(&o2hb_live_lock); reg->hr_task = hb_task; spin_unlock(&o2hb_live_lock); + wake_up_process(hb_task); + ret = wait_event_interruptible(o2hb_steady_queue, atomic_read(®->hr_steady_iterations) == 0 || reg->hr_node_deleted); @@ -2012,7 +2016,7 @@ static ssize_t o2hb_region_dev_store(struct config_item *item, spin_unlock(&o2hb_live_lock); if (hb_task) - kthread_stop(hb_task); + kthread_stop_put(hb_task); o2hb_unmap_slot_data(reg); @@ -2208,7 +2212,7 @@ static void o2hb_heartbeat_group_drop_item(struct config_group *group, spin_unlock(&o2hb_live_lock); if (hb_task) - kthread_stop(hb_task); + kthread_stop_put(hb_task); if (o2hb_global_heartbeat_active()) { spin_lock(&o2hb_live_lock); -- 2.53.0