diff options
| author | Su Yue <suy.fnst@cn.fujitsu.com> | 2017-06-06 12:57:07 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-21 20:16:04 +0300 |
| commit | 64c7b01446f4f1cea3cc4be041001f415ebfdc61 (patch) | |
| tree | 1a81584cc92f93ab11e157cc3db4baf671e78259 /fs/btrfs | |
| parent | 488d7c4566536b8807381bc54e559fd43decd26a (diff) | |
| download | linux-64c7b01446f4f1cea3cc4be041001f415ebfdc61.tar.xz | |
btrfs: Check name_len before in btrfs_del_root_ref
btrfs_del_root_ref calls btrfs_search_slot and reads name from root_ref.
Call btrfs_is_name_len_valid before memcmp.
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/root-tree.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 7d6bc308bf43..460db0cb2d07 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -390,6 +390,13 @@ again: WARN_ON(btrfs_root_ref_dirid(leaf, ref) != dirid); WARN_ON(btrfs_root_ref_name_len(leaf, ref) != name_len); ptr = (unsigned long)(ref + 1); + ret = btrfs_is_name_len_valid(leaf, path->slots[0], ptr, + name_len); + if (!ret) { + err = -EIO; + goto out; + } + WARN_ON(memcmp_extent_buffer(leaf, name, ptr, name_len)); *sequence = btrfs_root_ref_sequence(leaf, ref); |