btrfs: validate root ref names in tree-checker
PATCH v3 1/1 btrfs: validate root ref names in tree-checker
ROOT_REF and ROOT_BACKREF items contain a struct btrfs_root_ref followed by the subvolume name. Several readers assume that this layout is already valid and then use the on-disk name length directly. A corrupted item can therefore make those readers address bytes outside the item, and BTRFS_IOC_GET_SUBVOL_INFO can copy too many bytes into its fixed-size UAPI name buffer.
Validate ROOT_REF and ROOT_BACKREF items in tree-checker before any reader uses them. Reject items smaller than struct btrfs_root_ref, reject records whose name_len does not exactly describe the remaining item payload, and reject names longer than BTRFS_SUBVOL_NAME_MAX.
For BTRFS_IOC_GET_SUBVOL_INFO, copy only the validated on-disk name_len and keep a local BTRFS_VOL_NAME_MAX guard for the fixed ioctl output field. Terminate the copied name explicitly.
Changes since v2:
- Regenerate the mail-ready patch without the nested mbox wrapper.
- No code changes beyond the v2 fix.
Sanitizer validation reported:
KASAN slab-out-of-bounds in read_extent_buffer()
Write of size 505 Call trace: dump_stack_lvl() (?:?) print_address_description() (mm/kasan/report.c:373) read_extent_buffer() (?:?) print_report() (?:?) __virt_addr_valid() (?:?) srso_alias_return_thunk() (arch/x86/include/asm/nospec-branch.h:375) kasan_addr_to_slab() (mm/kasan/common.c:45) kasan_report() (?:?) kasan_check_range() (?:?) __asan_memcpy() (mm/kasan/shadow.c:103) btrfs_ioctl_get_subvol_info() (fs/btrfs/ioctl.c:1948) btrfs_get_32() (?:?) btrfs_set_16() (?:?) btrfs_test_get_subvol_info_name_oob() (?:?) btrfs_run_sanity_tests() (?:?) init_btrfs_fs() (fs/btrfs/super.c:2690) do_one_initcall() (init/main.c:1382) __kasan_kmalloc() (?:?) rcu_is_watching() (?:?) do_initcalls() (init/main.c:1457) kernel_init_freeable() (init/main.c:1674) kernel_init() (init/main.c:1584) ret_from_fork() (?:?) __switch_to() (?:?) ret_from_fork_asm() (?:?) kasan_save_stack() (mm/kasan/common.c:52) kasan_save_track() (mm/kasan/common.c:74)
---fs/btrfs/ioctl.c | 17 +++++++++++++----
fs/btrfs/tree-checker.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-)
fs/btrfs/ioctl.c +14 -6
@@ -1956,7 +1956,8 @@ static int btrfs_ioctl_get_subvol_info(struct inode *inode, void __user *argp)struct btrfs_root_ref *rref;struct extent_buffer *leaf;unsigned long item_off; -unsigned long item_len; +u32 item_size; +u16 name_len;int slot;int ret =0 ;
@@ -2034,14 +2035,21 @@ static int btrfs_ioctl_get_subvol_info(struct inode *inode, void __user *argp) subvol_info->parent_id = key.offset; rref = btrfs_item_ptr(leaf, slot, struct btrfs_root_ref); + item_size =btrfs_item_size (leaf, slot); + name_len =btrfs_root_ref_name_len (leaf, rref); +if (name_len > item_size -sizeof (*rref) || + name_len >BTRFS_VOL_NAME_MAX ) { + ret = -EUCLEAN ; + goto out; + } + subvol_info->dirid =btrfs_root_ref_dirid (leaf, rref); - item_off =btrfs_item_ptr_offset (leaf, slot) - +sizeof (struct btrfs_root_ref ); - item_len =btrfs_item_size (leaf, slot) - -sizeof (struct btrfs_root_ref ); + item_off =btrfs_item_ptr_offset (leaf, slot) + +sizeof (*rref);read_extent_buffer (leaf, subvol_info->name, - item_off, item_len); + item_off, name_len); + subvol_info->name[name_len] ='\0' ; }else { ret = -ENOENT ; goto out;
fs/btrfs/tree-checker.c +36 -0
@@ -1371,6 +1371,38 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,return 0 ; } +static int check_root_ref (struct extent_buffer *leaf,struct btrfs_key *key, +int slot) +{ +struct btrfs_root_ref *rref; +u32 item_size =btrfs_item_size (leaf, slot); +u32 name_len; + +if (unlikely (item_size <sizeof (*rref))) { +generic_err (leaf, slot, +"invalid root ref item size for key type %u, have %u expect >= %zu" , + key->type, item_size,sizeof (*rref)); +return -EUCLEAN ; + } + + rref = btrfs_item_ptr(leaf, slot, struct btrfs_root_ref); + name_len =btrfs_root_ref_name_len (leaf, rref); +if (unlikely (name_len >BTRFS_SUBVOL_NAME_MAX )) { +generic_err (leaf, slot, +"root ref name too long for key type %u, have %u max %u" , + key->type, name_len,BTRFS_SUBVOL_NAME_MAX ); +return -EUCLEAN ; + } +if (unlikely (item_size !=sizeof (*rref) + name_len)) { +generic_err (leaf, slot, +"invalid root ref item size for key type %u, have %u expect %zu" , + key->type, item_size,sizeof (*rref) + name_len); +return -EUCLEAN ; + } + +return 0 ; +} + __printf(3,4)__cold static void extent_err(const struct extent_buffer *eb, int slot,
@@ -2226,6 +2258,10 @@ static enum btrfs_tree_block_status check_leaf_item(struct extent_buffer *leaf,case BTRFS_ROOT_ITEM_KEY : ret =check_root_item (leaf, key, slot);break ; +case BTRFS_ROOT_REF_KEY : +case BTRFS_ROOT_BACKREF_KEY : + ret =check_root_ref (leaf, key, slot); +break ;case BTRFS_EXTENT_ITEM_KEY :case BTRFS_METADATA_ITEM_KEY : ret =check_extent_item (leaf, key, slot, prev_key);
Signature · 1 line
2.43.0