fs/ntfs3: bound DeleteAttribute asize against rec->used in do_action
Subsystems (2)
PATCH 1/1 fs/ntfs3: bound DeleteAttribute asize against rec->used in do_action
In do_action()'s DeleteAttribute case (fslog.c:3316), attr is Add2Ptr(rec, roff) with roff taken from the on-disk lrh->record_off, and asize = le32_to_cpu(attr->size) is read straight out of the MFT record:
asize = le32_to_cpu(attr->size); used = le32_to_cpu(rec->used); if (!check_if_attr(rec, lrh)) goto dirty_vol; ... memmove(attr, Add2Ptr(attr, asize), used - asize - roff);
check_if_attr() (fslog.c:2869) walks the attribute chain from rec->attr_off and returns o == ro. Its loop breaks on ATTR_END, so ro may legitimately equal the offset of the ATTR_END marker; that is exactly how CreateAttribute appends to a record. But check_file_record()'s walk (fslog.c:2831) also stops at ATTR_END, so check_attr() never inspects the bytes there. When roff is the ATTR_END offset, those never-validated bytes are what gets read as attr->size, and used - asize - roff underflows.
The read itself is also unbounded: roff is a u16 and attr->size is dereferenced at fslog.c:3317, before check_if_attr() has constrained roff at all, so it can be up to ~64K past a record_size-sized object.
Commit 0ca0485e4b2e ("fs/ntfs3: validate rec->used in journal-replay file record check") added at fslog.c:2844
if (used < PtrOffset(rec, attr) + sizeof(attr->type)) return false;
and its changelog names this very memmove. It bounds rec->used against the ATTR_END offset; it does not bound asize. With record_size 0x400, attr_off 0x38, a valid three-attribute chain ending in ATTR_END at 0x158 and used 0x160, a record whose four bytes at 0x15c read 0x100 gives
used - asize - roff = 0x160 - 0x100 - 0x158 = 0xffffff08
i.e. a ~4 GiB memmove whose source and destination both run off the end of rec, a kmalloc(sbi->record_size) object (record.c:105).
The equivalent non-replay path already refuses this. mi_remove_attr() performs the same removal and starts with (record.c:548):
if (aoff + asize > used) return false;
Apply the same bound, spelled as a subtraction to match the neighbouring cases, and move the attr->size read after check_if_attr() so that the header is known to lie inside the record before it is dereferenced. Requiring roff + SIZEOF_RESIDENT <= used rejects the ATTR_END offset without rejecting any real attribute: for an attribute the walk validated, roff + asize <= off(ATTR_END) <= used - 4, and any attribute a DeleteAttribute record can legitimately name carries a full resident header, so roff + SIZEOF_RESIDENT <= roff + asize <= used - 4. check_attr() itself imposes no lower bound on asize, so a crafted sub-header asize can still pass the first test; the second test then bounds it and the memmove stays inside the record.
Reproduced by mounting a crafted image on v7.2-rc5, which already contains 0ca0485e4b2e, under KASAN. The image is an ordinary mkfs.ntfs volume with four bytes of one MFT record changed and a crafted $LogFile:
BUG: KASAN: slab-out-of-bounds in do_action.isra.0+0x3211/0x83c0 Read of size 4294967048 at addr ffff888002423258 by task mount/66 CPU: 1 UID: 0 PID: 66 Comm: mount Not tainted 7.2.0-rc5 #3 Call Trace: kasan_report+0xce/0x100 kasan_check_range+0x105/0x1b0 __asan_memmove+0x23/0x60 do_action.isra.0+0x3211/0x83c0 log_replay+0x920a/0xd300 ntfs_loadlog_and_replay+0x3ef/0x510 ntfs_fill_super+0x1d23/0x4550 get_tree_bdev_flags+0x2ef/0x550 vfs_get_tree+0x82/0x2f0 fc_mount+0x10/0x1b0 path_mount+0x517/0x1df0 __x64_sys_mount+0x20b/0x270 do_syscall_64+0xf9/0x540 entry_SYSCALL_64_after_hwframe+0x77/0x7f Allocated by task 66: __kasan_kmalloc+0x8f/0xa0 __kmalloc_noprof+0x1b4/0x460 mi_init+0x81/0x110 mi_get+0x6a/0x220 do_action.isra.0+0x1dbf/0x83c0 log_replay+0x920a/0xd300 ntfs_loadlog_and_replay+0x3ef/0x510 ntfs_fill_super+0x1d23/0x4550 The buggy address belongs to the object at ffff888002423000 which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 600 bytes inside of allocated 1024-byte region [ffff888002423000, ffff888002423400)
KASAN reports the source side because __asan_memmove() (mm/kasan/shadow.c:94) validates src before dest and returns without copying. Both ends are out of bounds, and on a kernel built without KASAN the copy is performed.
rec->used is also left at used - asize by fslog.c:3323 before the memmove, so the record stays inconsistent even when the copy is suppressed; the same mount goes on to report "ino=1a, mi_enum_attr" and marks the volume dirty.
--- fs/ntfs3/fslog.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
fs/ntfs3/fslog.c +13 -2
@@ -3314,10 +3314,21 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,break ;case DeleteAttribute: - asize =le32_to_cpu (attr->size); used =le32_to_cpu (rec->used); -if (!check_if_attr (rec, lrh)) +/* +* check_if_attr() accepts a record_off that points at the +* ATTR_END marker, which is how CreateAttribute appends. The +* bytes there are not an attribute and check_attr() never +* validated them, so refuse an offset that cannot hold a +* resident header before reading attr->size, and then bound it +* as mi_remove_attr() does. +*/ +if (!check_if_attr (rec, lrh) || roff +SIZEOF_RESIDENT > used) + goto dirty_vol; + + asize =le32_to_cpu (attr->size); +if (asize > used - roff) goto dirty_vol; rec->used =cpu_to_le32 (used - asize);
Signature · 1 line
2.43.0
Konstantin Komarov
maintainerQuoted 132 lines · Hyeontae Lee
In do_action()'s DeleteAttribute case (fslog.c:3316), attr is
Add2Ptr(rec, roff)with roff taken from the on-disklrh->record_off, and asize =le32_to_cpu(attr->size)is read straight out of the MFT record:asize = le32_to_cpu(attr->size); used = le32_to_cpu(rec->used); if (!check_if_attr(rec, lrh)) goto dirty_vol; ... memmove(attr, Add2Ptr(attr, asize), used - asize - roff);
check_if_attr()(fslog.c:2869) walks the attribute chain fromrec->attr_offand returns o == ro. Its loop breaks onATTR_END, so ro may legitimately equal the offset of theATTR_ENDmarker; that is exactly how CreateAttribute appends to a record. But check_file_record()'s walk (fslog.c:2831) also stops atATTR_END, socheck_attr()never inspects the bytes there. When roff is theATTR_ENDoffset, those never-validated bytes are what gets read asattr->size, and used - asize - roff underflows.The read itself is also unbounded: roff is a u16 and
attr->sizeis dereferenced at fslog.c:3317, beforecheck_if_attr()has constrained roff at all, so it can be up to ~64K past a record_size-sized object.Commit
0ca0485e4b2e("fs/ntfs3: validaterec->usedin journal-replay file record check") added at fslog.c:2844if (used < PtrOffset(rec, attr) + sizeof(attr->type)) return false;and its changelog names this very memmove. It bounds
rec->usedagainst theATTR_ENDoffset; it does not bound asize. Withrecord_size0x400,attr_off0x38, a valid three-attribute chain ending inATTR_ENDat0x158and used0x160, a record whose four bytes at0x15cread0x100givesused - asize - roff = 0x160 - 0x100 - 0x158 = 0xffffff08i.e. a ~4 GiB memmove whose source and destination both run off the end of rec, a
kmalloc(sbi->record_size)object (record.c:105).The equivalent non-replay path already refuses this.
mi_remove_attr()performs the same removal and starts with (record.c:548):if (aoff + asize > used) return false;Apply the same bound, spelled as a subtraction to match the neighbouring cases, and move the
attr->sizeread aftercheck_if_attr()so that the header is known to lie inside the record before it is dereferenced. Requiring roff +SIZEOF_RESIDENT<= used rejects theATTR_ENDoffset without rejecting any real attribute: for an attribute the walk validated, roff + asize <=off(ATTR_END)<= used - 4, and any attribute a DeleteAttribute record can legitimately name carries a full resident header, so roff +SIZEOF_RESIDENT<= roff + asize <= used - 4.check_attr()itself imposes no lower bound on asize, so a crafted sub-header asize can still pass the first test; the second test then bounds it and the memmove stays inside the record.Reproduced by mounting a crafted image on v7.2-rc5, which already contains
0ca0485e4b2e, under KASAN. The image is an ordinary mkfs.ntfs volume with four bytes of one MFT record changed and a crafted $LogFile:BUG: KASAN: slab-out-of-bounds in do_action.isra.0+0x3211/0x83c0 Read of size 4294967048 at addr ffff888002423258 by task mount/66 CPU: 1 UID: 0 PID: 66 Comm: mount Not tainted 7.2.0-rc5 #3 Call Trace: kasan_report+0xce/0x100 kasan_check_range+0x105/0x1b0 __asan_memmove+0x23/0x60 do_action.isra.0+0x3211/0x83c0 log_replay+0x920a/0xd300 ntfs_loadlog_and_replay+0x3ef/0x510 ntfs_fill_super+0x1d23/0x4550 get_tree_bdev_flags+0x2ef/0x550 vfs_get_tree+0x82/0x2f0 fc_mount+0x10/0x1b0 path_mount+0x517/0x1df0 __x64_sys_mount+0x20b/0x270 do_syscall_64+0xf9/0x540 entry_SYSCALL_64_after_hwframe+0x77/0x7f Allocated by task 66: __kasan_kmalloc+0x8f/0xa0 __kmalloc_noprof+0x1b4/0x460 mi_init+0x81/0x110 mi_get+0x6a/0x220 do_action.isra.0+0x1dbf/0x83c0 log_replay+0x920a/0xd300 ntfs_loadlog_and_replay+0x3ef/0x510 ntfs_fill_super+0x1d23/0x4550 The buggy address belongs to the object at ffff888002423000 which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 600 bytes inside of allocated 1024-byte region [ffff888002423000, ffff888002423400)KASAN reports the source side because
__asan_memmove()(mm/kasan/shadow.c:94) validates src before dest and returns without copying. Both ends are out of bounds, and on a kernel built without KASAN the copy is performed.
rec->usedis also left at used - asize by fslog.c:3323 before the memmove, so the record stays inconsistent even when the copy is suppressed; the same mount goes on to report "ino=1a,mi_enum_attr" and marks the volume dirty.Fixes b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")Assisted-by Claude:claude-opus-5Signed-off-by Hyeontae Lee <[email protected]>--- fs/ntfs3/fslog.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)fs/ntfs3/fslog.c +6
-2@@ -3314,10 +3314,21 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,break ;case DeleteAttribute: - asize =le32_to_cpu (attr->size); used =le32_to_cpu (rec->used); -if (!check_if_attr (rec, lrh)) +/* +* check_if_attr() accepts a record_off that points at the +* ATTR_END marker, which is how CreateAttribute appends. The +* bytes there are not an attribute and check_attr() never +* validated them, so refuse an offset that cannot hold a +* resident header before reading attr->size, and then bound it
fs/ntfs3/fslog.c static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe, · line 3334
Quoted 10 lines
fs/ntfs3/fslog.c +7
-0+* as mi_remove_attr() does. +*/ +if (!check_if_attr (rec, lrh) || roff +SIZEOF_RESIDENT > used) + goto dirty_vol; + + asize =le32_to_cpu (attr->size); +if (asize > used - roff) goto dirty_vol; rec->used =cpu_to_le32 (used - asize);
Hello,
Your patch was applied, thanks.
Regards,
Konstantin