[PATCH v3] ocfs2: drain fs_state readers before journal teardown

From: Cen Zhang

Date: Sat Nov 21 2026 - 02:52:11 EST


The fs_state debugfs open callback builds a snapshot from mount state,
including the journal and cluster connection. The file is published
before ocfs2_mount_volume() and removed after journal and DLM shutdown,
so an open can overlap teardown on unmount or mount failure.

Publish fs_state at the successful end of ocfs2_fill_super(), after the
last fallible mount step. Remove it in ocfs2_put_super() before calling
ocfs2_dismount_volume(). Debugfs removal excludes new opens and drains
active callbacks. The release callback only frees the per-open snapshot.

KASAN reported:

BUG: KASAN: slab-use-after-free in ocfs2_osb_debug_open+0x967/0x15e0
Read of size 4 at addr ffff888116a56028 by task cat/502
...
Freed by task 504:
kfree+0x308/0x580
ocfs2_journal_shutdown+0x10a/0xc20
ocfs2_dismount_volume+0x315/0x940

Fixes: da5e7c87827e ("ocfs2: cleanup journal init and shutdown")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Cen Zhang <zzzccc427@xxxxxxxxx>
---
Changes in v3:
- Create fs_state at the successful end of ocfs2_fill_super() so failed
mounts never publish it.
- Remove fs_state in ocfs2_put_super() before volume teardown so creation
and removal are paired at the superblock level (Joseph Qi).

Changes in v2:
- Address the osb dereference before BUG_ON(!osb) raised by Sashiko:
https://sashiko.dev/#/patchset/98583
- Remove fs_state after BUG_ON(!osb) in ocfs2_dismount_volume().
- Trim the KASAN report.

Link to v1: https://lore.kernel.org/r/pm-ocfs2-objects-candidate-0003-v6-2f69dbb7417fcd537be6@xxxxxxxxx
Link to v2: https://lore.kernel.org/r/pm-ocfs2-objects-candidate-0003-v7-1522d068e5b943786c3e@xxxxxxxxx

This patch was written with assistance from Codex (OpenAI).

fs/ocfs2/super.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 0af2245ae303..2a58d3cd9690 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1072,9 +1072,6 @@ static int ocfs2_fill_super(struct super_block *sb, struct fs_context *fc)
osb->osb_debug_root = debugfs_create_dir(osb->uuid_str,
ocfs2_debugfs_root);

- debugfs_create_file("fs_state", S_IFREG|S_IRUSR, osb->osb_debug_root,
- osb, &ocfs2_osb_debug_fops);
-
if (ocfs2_meta_ecc(osb)) {
ocfs2_initialize_journal_triggers(sb, osb->s_journal_triggers);
ocfs2_blockcheck_stats_debugfs_install( &osb->osb_ecc_stats,
@@ -1158,6 +1155,10 @@ static int ocfs2_fill_super(struct super_block *sb, struct fs_context *fc)
/* Start this when the mount is almost sure of being successful */
ocfs2_orphan_scan_start(osb);

+ /* Publish fs_state only after all fallible mount steps. */
+ debugfs_create_file("fs_state", 0400, osb->osb_debug_root,
+ osb, &ocfs2_osb_debug_fops);
+
return status;

out_dismount:
@@ -1555,8 +1556,13 @@ static void __exit ocfs2_exit(void)

static void ocfs2_put_super(struct super_block *sb)
{
+ struct ocfs2_super *osb = OCFS2_SB(sb);
+
trace_ocfs2_put_super(sb);

+ /* Drain fs_state opens before releasing their backing state. */
+ debugfs_lookup_and_remove("fs_state", osb->osb_debug_root);
+
ocfs2_sync_blockdev(sb);
ocfs2_dismount_volume(sb, 0);
}