diff options
| author | Josef Bacik <josef@redhat.com> | 2011-03-16 16:47:17 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2011-03-17 14:21:41 -0400 |
| commit | 22a94d44bd6876a90630338229da6c0436d46593 (patch) | |
| tree | 50e5c7dd52ccf9292240de995e5b42b1619bcd82 /fs/btrfs/tree-log.c | |
| parent | 41415730a1050499fbd63b3f7dd59b3a4c3bb91a (diff) | |
| download | kernel_samsung_smdk4412-22a94d44bd6876a90630338229da6c0436d46593.zip kernel_samsung_smdk4412-22a94d44bd6876a90630338229da6c0436d46593.tar.gz kernel_samsung_smdk4412-22a94d44bd6876a90630338229da6c0436d46593.tar.bz2 | |
Btrfs: add checks to verify dir items are correct
We need to make sure the dir items we get are valid dir items. So any time we
try and read one check it with verify_dir_item, which will do various sanity
checks to make sure it looks sane. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index a4bbb85..429cfcf 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1286,6 +1286,8 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans, ptr_end = ptr + item_size; while (ptr < ptr_end) { di = (struct btrfs_dir_item *)ptr; + if (verify_dir_item(root, eb, di)) + return -EIO; name_len = btrfs_dir_name_len(eb, di); ret = replay_one_name(trans, root, path, eb, di, key); BUG_ON(ret); @@ -1412,6 +1414,11 @@ again: ptr_end = ptr + item_size; while (ptr < ptr_end) { di = (struct btrfs_dir_item *)ptr; + if (verify_dir_item(root, eb, di)) { + ret = -EIO; + goto out; + } + name_len = btrfs_dir_name_len(eb, di); name = kmalloc(name_len, GFP_NOFS); if (!name) { |