From 6cbb400d6f91698fb73f00c6e6b53be645f05ffb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 25 Feb 2022 10:02:58 +0100 Subject: [PATCH] 5.10-stable patches added patches: btrfs-tree-checker-check-item_size-for-dev_item.patch btrfs-tree-checker-check-item_size-for-inode_item.patch --- ...checker-check-item_size-for-dev_item.patch | 44 +++++++ ...ecker-check-item_size-for-inode_item.patch | 113 ++++++++++++++++++ queue-5.10/series | 2 + 3 files changed, 159 insertions(+) create mode 100644 queue-5.10/btrfs-tree-checker-check-item_size-for-dev_item.patch create mode 100644 queue-5.10/btrfs-tree-checker-check-item_size-for-inode_item.patch diff --git a/queue-5.10/btrfs-tree-checker-check-item_size-for-dev_item.patch b/queue-5.10/btrfs-tree-checker-check-item_size-for-dev_item.patch new file mode 100644 index 00000000000..ab559530ee2 --- /dev/null +++ b/queue-5.10/btrfs-tree-checker-check-item_size-for-dev_item.patch @@ -0,0 +1,44 @@ +From ea1d1ca4025ac6c075709f549f9aa036b5b6597d Mon Sep 17 00:00:00 2001 +From: Su Yue +Date: Fri, 21 Jan 2022 17:33:35 +0800 +Subject: btrfs: tree-checker: check item_size for dev_item + +From: Su Yue + +commit ea1d1ca4025ac6c075709f549f9aa036b5b6597d upstream. + +Check item size before accessing the device item to avoid out of bound +access, similar to inode_item check. + +Signed-off-by: Su Yue +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/tree-checker.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/fs/btrfs/tree-checker.c ++++ b/fs/btrfs/tree-checker.c +@@ -947,6 +947,7 @@ static int check_dev_item(struct extent_ + struct btrfs_key *key, int slot) + { + struct btrfs_dev_item *ditem; ++ const u32 item_size = btrfs_item_size_nr(leaf, slot); + + if (key->objectid != BTRFS_DEV_ITEMS_OBJECTID) { + dev_item_err(leaf, slot, +@@ -954,6 +955,13 @@ static int check_dev_item(struct extent_ + key->objectid, BTRFS_DEV_ITEMS_OBJECTID); + return -EUCLEAN; + } ++ ++ if (unlikely(item_size != sizeof(*ditem))) { ++ dev_item_err(leaf, slot, "invalid item size: has %u expect %zu", ++ item_size, sizeof(*ditem)); ++ return -EUCLEAN; ++ } ++ + ditem = btrfs_item_ptr(leaf, slot, struct btrfs_dev_item); + if (btrfs_device_id(leaf, ditem) != key->offset) { + dev_item_err(leaf, slot, diff --git a/queue-5.10/btrfs-tree-checker-check-item_size-for-inode_item.patch b/queue-5.10/btrfs-tree-checker-check-item_size-for-inode_item.patch new file mode 100644 index 00000000000..8fdf5cec94d --- /dev/null +++ b/queue-5.10/btrfs-tree-checker-check-item_size-for-inode_item.patch @@ -0,0 +1,113 @@ +From 0c982944af27d131d3b74242f3528169f66950ad Mon Sep 17 00:00:00 2001 +From: Su Yue +Date: Fri, 21 Jan 2022 17:33:34 +0800 +Subject: btrfs: tree-checker: check item_size for inode_item + +From: Su Yue + +commit 0c982944af27d131d3b74242f3528169f66950ad upstream. + +while mounting the crafted image, out-of-bounds access happens: + + [350.429619] UBSAN: array-index-out-of-bounds in fs/btrfs/struct-funcs.c:161:1 + [350.429636] index 1048096 is out of range for type 'page *[16]' + [350.429650] CPU: 0 PID: 9 Comm: kworker/u8:1 Not tainted 5.16.0-rc4 #1 + [350.429652] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014 + [350.429653] Workqueue: btrfs-endio-meta btrfs_work_helper [btrfs] + [350.429772] Call Trace: + [350.429774] + [350.429776] dump_stack_lvl+0x47/0x5c + [350.429780] ubsan_epilogue+0x5/0x50 + [350.429786] __ubsan_handle_out_of_bounds+0x66/0x70 + [350.429791] btrfs_get_16+0xfd/0x120 [btrfs] + [350.429832] check_leaf+0x754/0x1a40 [btrfs] + [350.429874] ? filemap_read+0x34a/0x390 + [350.429878] ? load_balance+0x175/0xfc0 + [350.429881] validate_extent_buffer+0x244/0x310 [btrfs] + [350.429911] btrfs_validate_metadata_buffer+0xf8/0x100 [btrfs] + [350.429935] end_bio_extent_readpage+0x3af/0x850 [btrfs] + [350.429969] ? newidle_balance+0x259/0x480 + [350.429972] end_workqueue_fn+0x29/0x40 [btrfs] + [350.429995] btrfs_work_helper+0x71/0x330 [btrfs] + [350.430030] ? __schedule+0x2fb/0xa40 + [350.430033] process_one_work+0x1f6/0x400 + [350.430035] ? process_one_work+0x400/0x400 + [350.430036] worker_thread+0x2d/0x3d0 + [350.430037] ? process_one_work+0x400/0x400 + [350.430038] kthread+0x165/0x190 + [350.430041] ? set_kthread_struct+0x40/0x40 + [350.430043] ret_from_fork+0x1f/0x30 + [350.430047] + [350.430077] BTRFS warning (device loop0): bad eb member start: ptr 0xffe20f4e start 20975616 member offset 4293005178 size 2 + +check_leaf() is checking the leaf: + + corrupt leaf: root=4 block=29396992 slot=1, bad key order, prev (16140901064495857664 1 0) current (1 204 12582912) + leaf 29396992 items 6 free space 3565 generation 6 owner DEV_TREE + leaf 29396992 flags 0x1(WRITTEN) backref revision 1 + fs uuid a62e00e8-e94e-4200-8217-12444de93c2e + chunk uuid cecbd0f7-9ca0-441e-ae9f-f782f9732bd8 + item 0 key (16140901064495857664 INODE_ITEM 0) itemoff 3955 itemsize 40 + generation 0 transid 0 size 0 nbytes 17592186044416 + block group 0 mode 52667 links 33 uid 0 gid 2104132511 rdev 94223634821136 + sequence 100305 flags 0x2409000(none) + atime 0.0 (1970-01-01 08:00:00) + ctime 2973280098083405823.4294967295 (-269783007-01-01 21:37:03) + mtime 18446744071572723616.4026825121 (1902-04-16 12:40:00) + otime 9249929404488876031.4294967295 (622322949-04-16 04:25:58) + item 1 key (1 DEV_EXTENT 12582912) itemoff 3907 itemsize 48 + dev extent chunk_tree 3 + chunk_objectid 256 chunk_offset 12582912 length 8388608 + chunk_tree_uuid cecbd0f7-9ca0-441e-ae9f-f782f9732bd8 + +The corrupted leaf of device tree has an inode item. The leaf passed +checksum and others checks in validate_extent_buffer until check_leaf_item(). +Because of the key type BTRFS_INODE_ITEM, check_inode_item() is called even we +are in the device tree. Since the +item offset + sizeof(struct btrfs_inode_item) > eb->len, out-of-bounds access +is triggered. + +The item end vs leaf boundary check has been done before +check_leaf_item(), so fix it by checking item size in check_inode_item() +before access of the inode item in extent buffer. + +Other check functions except check_dev_item() in check_leaf_item() +have their item size checks. +The commit for check_dev_item() is followed. + +No regression observed during running fstests. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215299 +CC: stable@vger.kernel.org # 5.10+ +CC: Wenqing Liu +Signed-off-by: Su Yue +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/tree-checker.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/fs/btrfs/tree-checker.c ++++ b/fs/btrfs/tree-checker.c +@@ -989,6 +989,7 @@ static int check_inode_item(struct exten + struct btrfs_inode_item *iitem; + u64 super_gen = btrfs_super_generation(fs_info->super_copy); + u32 valid_mask = (S_IFMT | S_ISUID | S_ISGID | S_ISVTX | 0777); ++ const u32 item_size = btrfs_item_size_nr(leaf, slot); + u32 mode; + int ret; + +@@ -996,6 +997,12 @@ static int check_inode_item(struct exten + if (ret < 0) + return ret; + ++ if (unlikely(item_size != sizeof(*iitem))) { ++ generic_err(leaf, slot, "invalid item size: has %u expect %zu", ++ item_size, sizeof(*iitem)); ++ return -EUCLEAN; ++ } ++ + iitem = btrfs_item_ptr(leaf, slot, struct btrfs_inode_item); + + /* Here we use super block generation + 1 to handle log tree */ diff --git a/queue-5.10/series b/queue-5.10/series index 5ac931fd893..f568fd12690 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -1 +1,3 @@ cgroup-cpuset-fix-a-race-between-cpuset_attach-and-cpu-hotplug.patch +btrfs-tree-checker-check-item_size-for-inode_item.patch +btrfs-tree-checker-check-item_size-for-dev_item.patch -- 2.47.3