ntfs: bound $AttrDef table walk to the loaded table size
Subsystems (2)
PATCH 1/1 ntfs: bound $AttrDef table walk to the loaded table size
ntfs_attr_find_in_attrdef() walks the in-memory $AttrDef table, but the loop condition bounds only the start of each entry, not the whole entry:
for (ad = vol->attrdef; (u8 *)ad - (u8 *)vol->attrdef < vol->attrdef_size && ad->type; ++ad)
struct attr_def is 160 bytes; the guard reads ad->type at offset 128 and the loop body reads further fields. vol->attrdef is kvzalloc(i_size), where i_size is the on-disk $AttrDef data size, checked in load_and_init_attrdef() only as 0 < i_size <= 0x7fffffff. A volume whose $AttrDef data size is smaller than one entry (e.g. 120 bytes) makes the read of ad->type run past the allocation. Creating a file reaches this through ntfs_attr_size_bounds_check() and reads out of bounds:
BUG: KASAN: slab-out-of-bounds in ntfs_attr_find_in_attrdef+0x66/0xa0 Read of size 4 at addr ffff888005833280 by task init/1 ntfs_attr_find_in_attrdef ntfs_attr_size_bounds_check ntfs_attr_can_be_non_resident ntfs_attr_add
Require the whole entry to lie within attrdef_size in the loop guard, and reject at mount a $AttrDef too small to hold one attr_def entry.
---
Two parts in this change.
1/ The loop guard in ntfs_attr_find_in_attrdef() to fix the OOB access. 2/ A mount-time check in load_and_init_attrdef() that rejects a $AttrDef that can't hold an entry. This is a clearly corrupt table and is refused up front.
A reproducer is available on request.
fs/ntfs/attrib.c | 2 +- fs/ntfs/super.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/ntfs/attrib.c +1 -1
@@ -1737,7 +1737,7 @@ static struct attr_def *ntfs_attr_find_in_attrdef(const struct ntfs_volume *vol,struct attr_def *ad;WARN_ON (!type); -for (ad = vol->attrdef; (u8 *)ad - (u8 *)vol->attrdef < +for (ad = vol->attrdef; (u8 *)(ad +1 ) - (u8 *)vol->attrdef <= vol->attrdef_size && ad->type; ++ad) {/* We have not found it yet, carry on searching. */ if (likely (le32_to_cpu (ad->type) <le32_to_cpu (type)))
fs/ntfs/super.c +2 -2
@@ -1241,9 +1241,9 @@ static bool load_and_init_attrdef(struct ntfs_volume *vol) goto failed; }NInoSetSparseDisabled (NTFS_I (ino)); -/* The size of FILE_AttrDef must be above 0 and fit inside 31 bits. */ +/* FILE_AttrDef must hold at least one entry and fit inside 31 bits. */ i_size =i_size_read (ino); -if (i_size <=0 || i_size >0x7fffffff ) +if (i_size < (s64 )sizeof (struct attr_def ) || i_size >0x7fffffff ) goto iput_failed; vol->attrdef =kvzalloc (i_size,GFP_NOFS );if (!vol->attrdef)
Namjae Jeon
maintainerfs/ntfs/attrib.c static struct attr_def *ntfs_attr_find_in_attrdef(const struct ntfs_volume *vol, · line 1740
Quoted 6 lines
fs/ntfs/attrib.c +1
-1@@ -1737,7 +1737,7 @@ static struct attr_def *ntfs_attr_find_in_attrdef(const struct ntfs_volume *vol,struct attr_def *ad;WARN_ON (!type); - for (ad = vol->attrdef; (u8 *)ad - (u8 *)vol->attrdef < + for (ad = vol->attrdef; (u8 *)(ad + 1) - (u8 *)vol->attrdef <=
I would prefer not to have ad + 1 check form a pointer beyond the end of the buffer after the last entry.
How about this instead ?
(u8 *)ad - (u8 *)vol->attrdef <=
vol->attrdef_size - (s32)sizeof(*ad)
Thanks.
Quoted 3 lines
fs/ntfs/attrib.c +0
-0vol->attrdef_size && ad->type; ++ad) {/* We have not found it yet, carry on searching. */ if (likely (le32_to_cpu (ad->type) <le32_to_cpu (type)))