ocfs2: validate active orphan slots during inode read
cover ocfs2: validate active orphan slots during inode read
OCFS2 trusts active ordinary and append-DIO orphan slots read from dinodes. A corrupted slot can therefore index osb_orphan_wipes or the slot-local system-inode cache outside their allocations before the corruption is reported.
Patch 1 validates the ordinary orphan slot used by inode wipe processing. Patch 2 validates the append-DIO orphan slot used by DIO completion and orphan recovery. Both checks reject corrupt metadata at the existing inode validation boundary.
ZhengYuan Huang (2):
ocfs2: validate orphan slot during inode read
ocfs2: validate DIO orphan slot during inode read
fs/ocfs2/inode.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Signature · 1 line
2.43.0
PATCH 1/2 ocfs2: validate orphan slot during inode read
[BUG]
A corrupted dinode with OCFS2_ORPHANED_FL can carry an i_orphaned_slot outside the mounted filesystem slot range. ocfs2_wipe_inode() uses it to index osb_orphan_wipes before looking up the orphan directory, causing an out-of-bounds memory access.
BUG: KASAN: slab-use-after-free in ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 Read of size 8 at addr ffff88800b767c00 by task kworker/u8:3/85 Call Trace: ... ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 ocfs2_wipe_inode+0x292/0xf70 fs/ocfs2/inode.c:840 ocfs2_delete_inode fs/ocfs2/inode.c:1155 [inline] ocfs2_evict_inode+0x6c9/0x1170 fs/ocfs2/inode.c:1295 evict+0x38e/0x8f0 fs/inode.c:810 iput_final fs/inode.c:1914 [inline] iput fs/inode.c:1966 [inline] iput+0x55b/0x8b0 fs/inode.c:1926 ocfs2_recover_orphans+0x610/0xe40 fs/ocfs2/journal.c:2374 ocfs2_complete_recovery+0x5af/0xd00 fs/ocfs2/journal.c:1373 ...
[CAUSE]ocfs2_validate_inode_block() validates i_suballoc_slot but leaves the active ordinary orphan slot unchecked. Downstream consumers assume that the value is smaller than osb->max_slots.
[FIX]
Reject an active i_orphaned_slot outside the slot range during dinode validation, before the inode reaches orphan wipe processing.
--- fs/ocfs2/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/ocfs2/inode.c +8 -0
@@ -1528,6 +1528,14 @@ int ocfs2_validate_inode_block(struct super_block *sb, goto bail; } +if ((le32_to_cpu (di->i_flags) &OCFS2_ORPHANED_FL ) && +le16_to_cpu (di->i_orphaned_slot) >=OCFS2_SB (sb)->max_slots) { + rc =ocfs2_error (sb,"Invalid dinode %llu: orphaned slot %u\n" , + (unsigned long long )bh->b_blocknr, +le16_to_cpu (di->i_orphaned_slot)); + goto bail; + } +/* * Reject dinodes whose i_mode does not name one of the seven * canonical POSIX file types. ocfs2_populate_inode() copies
Signature · 1 line
2.43.0
Re: [PATCH 1/2] ocfs2: validate orphan slot during inode read
Quoted 27 lines · ZhengYuan Huang
[BUG]
A corrupted dinode withOCFS2_ORPHANED_FLcan carry ani_orphaned_slotoutside the mounted filesystem slot range.ocfs2_wipe_inode()uses it to indexosb_orphan_wipesbefore looking up the orphan directory, causing an out-of-bounds memory access.BUG: KASAN: slab-use-after-free in ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 Read of size 8 at addr ffff88800b767c00 by task kworker/u8:3/85 Call Trace: ... ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 ocfs2_wipe_inode+0x292/0xf70 fs/ocfs2/inode.c:840 ocfs2_delete_inode fs/ocfs2/inode.c:1155 [inline] ocfs2_evict_inode+0x6c9/0x1170 fs/ocfs2/inode.c:1295 evict+0x38e/0x8f0 fs/inode.c:810 iput_final fs/inode.c:1914 [inline] iput fs/inode.c:1966 [inline] iput+0x55b/0x8b0 fs/inode.c:1926 ocfs2_recover_orphans+0x610/0xe40 fs/ocfs2/journal.c:2374 ocfs2_complete_recovery+0x5af/0xd00 fs/ocfs2/journal.c:1373 ...[CAUSE]
ocfs2_validate_inode_block()validatesi_suballoc_slotbut leaves the active ordinary orphan slot unchecked. Downstream consumers assume that the value is smaller thanosb->max_slots.
Quoted 6 lines
[FIX]
Reject an activei_orphaned_slotoutside the slot range during dinode validation, before the inode reaches orphan wipe processing.Fixes b4df6ed8db0c ("[PATCH] ocfs2: fix orphan recovery deadlock")Signed-off-by ZhengYuan Huang <[email protected]>
Quoted 23 lines
--- fs/ocfs2/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)fs/ocfs2/inode.c +8
-0@@ -1528,6 +1528,14 @@ int ocfs2_validate_inode_block(struct super_block *sb, goto bail; } +if ((le32_to_cpu (di->i_flags) &OCFS2_ORPHANED_FL ) && +le16_to_cpu (di->i_orphaned_slot) >=OCFS2_SB (sb)->max_slots) { + rc =ocfs2_error (sb,"Invalid dinode %llu: orphaned slot %u\n" , + (unsigned long long )bh->b_blocknr, +le16_to_cpu (di->i_orphaned_slot)); + goto bail; + } +/* * Reject dinodes whose i_mode does not name one of the seven * canonical POSIX file types. ocfs2_populate_inode() copies
PATCH 2/2 ocfs2: validate DIO orphan slot during inode read
In reply to ZhengYuan Huang[BUG]
A corrupted append-DIO dinode (high byte at offset 0xa1 corrupted from 0 to 1) can carry an i_dio_orphaned_slot outside the mounted filesystem slot range and trigger a use-after-free error:
BUG: KASAN: slab-use-after-free in ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 Read of size 8 at addr ffff88800b767c00 by task kworker/u8:3/85 Call Trace: ... ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 ocfs2_wipe_inode+0x292/0xf70 fs/ocfs2/inode.c:840 ocfs2_delete_inode fs/ocfs2/inode.c:1155 [inline] ocfs2_evict_inode+0x6c9/0x1170 fs/ocfs2/inode.c:1295 evict+0x38e/0x8f0 fs/inode.c:810 iput_final fs/inode.c:1914 [inline] iput fs/inode.c:1966 [inline] iput+0x55b/0x8b0 fs/inode.c:1926 ocfs2_recover_orphans+0x610/0xe40 fs/ocfs2/journal.c:2374 ocfs2_complete_recovery+0x5af/0xd00 fs/ocfs2/journal.c:1373 ...
[CAUSE]ocfs2_del_inode_from_orphan() uses i_dio_orphaned_slot to index the slot-local system inode cache. The dinode validator does not check this active slot, so an out-of-range value produces an invalid cache entry pointer that is dereferenced as an inode pointer.
[FIX]
Reject an active i_dio_orphaned_slot outside the slot range during dinode validation, before DIO orphan recovery can consume it.
--- fs/ocfs2/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/ocfs2/inode.c +8 -0
@@ -1536,6 +1536,14 @@ int ocfs2_validate_inode_block(struct super_block *sb, goto bail; } +if ((le32_to_cpu (di->i_flags) &OCFS2_DIO_ORPHANED_FL ) && +le16_to_cpu (di->i_dio_orphaned_slot) >=OCFS2_SB (sb)->max_slots) { + rc =ocfs2_error (sb,"Invalid dinode %llu: DIO orphaned slot %u\n" , + (unsigned long long )bh->b_blocknr, +le16_to_cpu (di->i_dio_orphaned_slot)); + goto bail; + } +/* * Reject dinodes whose i_mode does not name one of the seven * canonical POSIX file types. ocfs2_populate_inode() copies
Signature · 1 line
2.43.0
Re: [PATCH 2/2] ocfs2: validate DIO orphan slot during inode read
Quoted 28 lines · ZhengYuan Huang
[BUG]
A corrupted append-DIO dinode (high byte at offset0xa1corrupted from 0 to 1) can carry ani_dio_orphaned_slotoutside the mounted filesystem slot range and trigger a use-after-free error:BUG: KASAN: slab-use-after-free in ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 Read of size 8 at addr ffff88800b767c00 by task kworker/u8:3/85 Call Trace: ... ocfs2_get_system_file_inode+0x780/0x820 fs/ocfs2/sysfile.c:102 ocfs2_wipe_inode+0x292/0xf70 fs/ocfs2/inode.c:840 ocfs2_delete_inode fs/ocfs2/inode.c:1155 [inline] ocfs2_evict_inode+0x6c9/0x1170 fs/ocfs2/inode.c:1295 evict+0x38e/0x8f0 fs/inode.c:810 iput_final fs/inode.c:1914 [inline] iput fs/inode.c:1966 [inline] iput+0x55b/0x8b0 fs/inode.c:1926 ocfs2_recover_orphans+0x610/0xe40 fs/ocfs2/journal.c:2374 ocfs2_complete_recovery+0x5af/0xd00 fs/ocfs2/journal.c:1373 ...[CAUSE]
ocfs2_del_inode_from_orphan()usesi_dio_orphaned_slotto index the slot-local system inode cache. The dinode validator does not check this active slot, so an out-of-range value produces an invalid cache entry pointer that is dereferenced as an inode pointer.
Quoted 6 lines
[FIX]
Reject an activei_dio_orphaned_slotoutside the slot range during dinode validation, before DIO orphan recovery can consume it.Fixes 06ee5c75b575 ("ocfs2: add functions to add and remove inode in orphan dir")Signed-off-by ZhengYuan Huang <[email protected]>
Quoted 23 lines
--- fs/ocfs2/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)fs/ocfs2/inode.c +8
-0@@ -1536,6 +1536,14 @@ int ocfs2_validate_inode_block(struct super_block *sb, goto bail; } +if ((le32_to_cpu (di->i_flags) &OCFS2_DIO_ORPHANED_FL ) && +le16_to_cpu (di->i_dio_orphaned_slot) >=OCFS2_SB (sb)->max_slots) { + rc =ocfs2_error (sb,"Invalid dinode %llu: DIO orphaned slot %u\n" , + (unsigned long long )bh->b_blocknr, +le16_to_cpu (di->i_dio_orphaned_slot)); + goto bail; + } +/* * Reject dinodes whose i_mode does not name one of the seven * canonical POSIX file types. ocfs2_populate_inode() copies
Quoted 4 lines · On Mon, 3 Aug 2026 11:00:05 +0800 ZhengYuan Huang <[email protected]> wrote:
OCFS2 trusts active ordinary and append-DIO orphan slots read from dinodes. A corrupted slot can therefore index
osb_orphan_wipesor the slot-local system-inode cache outside their allocations before the corruption is reported.
Thanks. AI review raised several possible issues, all pre-existing. "out of bound access", "crash the kernel", "out-of-bounds heap access", "triggering this crash", etc. All the usual things (seriously!).
https://sashiko.dev/#/patchset/[email protected]
None of which stands in the way of your fixes.
The best I can do with this onslaught is to make maintainers aware then move on.
I do wish that Sashiko was more organized about these drive-by bug reports. Retain them in some lookable-uppable way for maintainers to look at when they have time. This has been suggested to the Sashiko developers. Perhaps one day...
Joseph Qi
maintainerQuoted 15 lines · Andrew Morton
Quoted 4 lines · On Mon, 3 Aug 2026 11:00:05 +0800 ZhengYuan Huang <[email protected]> wrote:
OCFS2 trusts active ordinary and append-DIO orphan slots read from dinodes. A corrupted slot can therefore index
osb_orphan_wipesor the slot-local system-inode cache outside their allocations before the corruption is reported.Thanks. AI review raised several possible issues, all pre-existing. "out of bound access", "crash the kernel", "out-of-bounds heap access", "triggering this crash", etc. All the usual things (seriously!).
https://sashiko.dev/#/patchset/[email protected]None of which stands in the way of your fixes.
Quoted 7 lines
The best I can do with this onslaught is to make maintainers aware then move on.
I do wish that Sashiko was more organized about these drive-by bug reports. Retain them in some lookable-uppable way for maintainers to look at when they have time. This has been suggested to the Sashiko developers. Perhaps one day...
Addressed in:
https://lore.kernel.org/ocfs2-devel/[email protected]/T/#u
Thanks,
Joseph