Skip to content

Commit 9a66497

Browse files
ethanwu-synokdave
authored andcommitted
btrfs: correctly calculate item size used when item key collision happens
Item key collision is allowed for some item types, like dir item and inode refs, but the overall item size is limited by the nodesize. item size(ins_len) passed from btrfs_insert_empty_items to btrfs_search_slot already contains size of btrfs_item. When btrfs_search_slot reaches leaf, we'll see if we need to split leaf. The check incorrectly reports that split leaf is required, because it treats the space required by the newly inserted item as btrfs_item + item data. But in item key collision case, only item data is actually needed, the newly inserted item could merge into the existing one. No new btrfs_item will be inserted. And split_leaf return EOVERFLOW from following code: if (extend && data_size + btrfs_item_size_nr(l, slot) + sizeof(struct btrfs_item) > BTRFS_LEAF_DATA_SIZE(fs_info)) return -EOVERFLOW; In most cases, when callers receive EOVERFLOW, they either return this error or handle in different ways. For example, in normal dir item creation the userspace will get errno EOVERFLOW; in inode ref case INODE_EXTREF is used instead. However, this is not the case for rename. To avoid the unrecoverable situation in rename, btrfs_check_dir_item_collision is called in early phase of rename. In this function, when item key collision is detected leaf space is checked: data_size = sizeof(*di) + name_len; if (data_size + btrfs_item_size_nr(leaf, slot) + sizeof(struct btrfs_item) > BTRFS_LEAF_DATA_SIZE(root->fs_info)) the sizeof(struct btrfs_item) + btrfs_item_size_nr(leaf, slot) here refers to existing item size, the condition here correctly calculates the needed size for collision case rather than the wrong case above. The consequence of inconsistent condition check between btrfs_check_dir_item_collision and btrfs_search_slot when item key collision happens is that we might pass check here but fail later at btrfs_search_slot. Rename fails and volume is forced readonly [436149.586170] ------------[ cut here ]------------ [436149.586173] BTRFS: Transaction aborted (error -75) [436149.586196] WARNING: CPU: 0 PID: 16733 at fs/btrfs/inode.c:9870 btrfs_rename2+0x1938/0x1b70 [btrfs] [436149.586227] CPU: 0 PID: 16733 Comm: python Tainted: G D 4.18.0-rc5+ #1 [436149.586228] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/05/2016 [436149.586238] RIP: 0010:btrfs_rename2+0x1938/0x1b70 [btrfs] [436149.586254] RSP: 0018:ffffa327043a7ce0 EFLAGS: 00010286 [436149.586255] RAX: 0000000000000000 RBX: ffff8d8a17d13340 RCX: 0000000000000006 [436149.586256] RDX: 0000000000000007 RSI: 0000000000000096 RDI: ffff8d8a7fc164b0 [436149.586257] RBP: ffffa327043a7da0 R08: 0000000000000560 R09: 7265282064657472 [436149.586258] R10: 0000000000000000 R11: 6361736e61725420 R12: ffff8d8a0d4c8b08 [436149.586258] R13: ffff8d8a17d13340 R14: ffff8d8a33e0a540 R15: 00000000000001fe [436149.586260] FS: 00007fa313933740(0000) GS:ffff8d8a7fc00000(0000) knlGS:0000000000000000 [436149.586261] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [436149.586262] CR2: 000055d8d9c9a720 CR3: 000000007aae0003 CR4: 00000000003606f0 [436149.586295] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [436149.586296] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [436149.586296] Call Trace: [436149.586311] vfs_rename+0x383/0x920 [436149.586313] ? vfs_rename+0x383/0x920 [436149.586315] do_renameat2+0x4ca/0x590 [436149.586317] __x64_sys_rename+0x20/0x30 [436149.586324] do_syscall_64+0x5a/0x120 [436149.586330] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [436149.586332] RIP: 0033:0x7fa3133b1d37 [436149.586348] RSP: 002b:00007fffd3e43908 EFLAGS: 00000246 ORIG_RAX: 0000000000000052 [436149.586349] RAX: ffffffffffffffda RBX: 00007fa3133b1d30 RCX: 00007fa3133b1d37 [436149.586350] RDX: 000055d8da06b5e0 RSI: 000055d8da225d60 RDI: 000055d8da2c4da0 [436149.586351] RBP: 000055d8da2252f0 R08: 00007fa313782000 R09: 00000000000177e0 [436149.586351] R10: 000055d8da010680 R11: 0000000000000246 R12: 00007fa313840b00 Thanks to Hans van Kranenburg for information about crc32 hash collision tools, I was able to reproduce the dir item collision with following python script. https://github.com/wutzuchieh/misc_tools/blob/master/crc32_forge.py Run it under a btrfs volume will trigger the abort transaction. It simply creates files and rename them to forged names that leads to hash collision. There are two ways to fix this. One is to simply revert the patch 878f2d2 ("Btrfs: fix max dir item size calculation") to make the condition consistent although that patch is correct about the size. The other way is to handle the leaf space check correctly when collision happens. I prefer the second one since it correct leaf space check in collision case. This fix will not account sizeof(struct btrfs_item) when the item already exists. There are two places where ins_len doesn't contain sizeof(struct btrfs_item), however. 1. extent-tree.c: lookup_inline_extent_backref 2. file-item.c: btrfs_csum_file_blocks to make the logic of btrfs_search_slot more clear, we add a flag search_for_extension in btrfs_path. This flag indicates that ins_len passed to btrfs_search_slot doesn't contain sizeof(struct btrfs_item). When key exists, btrfs_search_slot will use the actual size needed to calculate the required leaf space. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: ethanwu <ethanwu@synology.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 3d45f22 commit 9a66497

File tree

4 files changed

+32
-2
lines changed

4 files changed

+32
-2
lines changed

fs/btrfs/ctree.c

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,8 +2555,14 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root,
25552555
* @p: Holds all btree nodes along the search path
25562556
* @root: The root node of the tree
25572557
* @key: The key we are looking for
2558-
* @ins_len: Indicates purpose of search, for inserts it is 1, for
2559-
* deletions it's -1. 0 for plain searches
2558+
* @ins_len: Indicates purpose of search:
2559+
* >0 for inserts it's size of item inserted (*)
2560+
* <0 for deletions
2561+
* 0 for plain searches, not modifying the tree
2562+
*
2563+
* (*) If size of item inserted doesn't include
2564+
* sizeof(struct btrfs_item), then p->search_for_extension must
2565+
* be set.
25602566
* @cow: boolean should CoW operations be performed. Must always be 1
25612567
* when modifying the tree.
25622568
*
@@ -2717,6 +2723,20 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,
27172723

27182724
if (level == 0) {
27192725
p->slots[level] = slot;
2726+
/*
2727+
* Item key already exists. In this case, if we are
2728+
* allowed to insert the item (for example, in dir_item
2729+
* case, item key collision is allowed), it will be
2730+
* merged with the original item. Only the item size
2731+
* grows, no new btrfs item will be added. If
2732+
* search_for_extension is not set, ins_len already
2733+
* accounts the size btrfs_item, deduct it here so leaf
2734+
* space check will be correct.
2735+
*/
2736+
if (ret == 0 && ins_len > 0 && !p->search_for_extension) {
2737+
ASSERT(ins_len >= sizeof(struct btrfs_item));
2738+
ins_len -= sizeof(struct btrfs_item);
2739+
}
27202740
if (ins_len > 0 &&
27212741
btrfs_leaf_free_space(b) < ins_len) {
27222742
if (write_lock_level < 1) {

fs/btrfs/ctree.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,12 @@ struct btrfs_path {
368368
unsigned int search_commit_root:1;
369369
unsigned int need_commit_sem:1;
370370
unsigned int skip_release_on_error:1;
371+
/*
372+
* Indicate that new item (btrfs_search_slot) is extending already
373+
* existing item and ins_len contains only the data size and not item
374+
* header (ie. sizeof(struct btrfs_item) is not included).
375+
*/
376+
unsigned int search_for_extension:1;
371377
};
372378
#define BTRFS_MAX_EXTENT_ITEM_SIZE(r) ((BTRFS_LEAF_DATA_SIZE(r->fs_info) >> 4) - \
373379
sizeof(struct btrfs_item))

fs/btrfs/extent-tree.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
844844
want = extent_ref_type(parent, owner);
845845
if (insert) {
846846
extra_size = btrfs_extent_inline_ref_size(want);
847+
path->search_for_extension = 1;
847848
path->keep_locks = 1;
848849
} else
849850
extra_size = -1;
@@ -996,6 +997,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
996997
out:
997998
if (insert) {
998999
path->keep_locks = 0;
1000+
path->search_for_extension = 0;
9991001
btrfs_unlock_up_safe(path, 1);
10001002
}
10011003
return err;

fs/btrfs/file-item.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,10 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
10161016
}
10171017

10181018
btrfs_release_path(path);
1019+
path->search_for_extension = 1;
10191020
ret = btrfs_search_slot(trans, root, &file_key, path,
10201021
csum_size, 1);
1022+
path->search_for_extension = 0;
10211023
if (ret < 0)
10221024
goto out;
10231025

0 commit comments

Comments
 (0)