Btrfs: fix verification of dir_item
PATCH 1/1 Btrfs: fix verification of dir_item
We were ignoring the name component of the dir_item. Both the name and data must fit within BTRFS_MAX_XATTR_SIZE(root).
Signed-off-by Filipe David Borba Manana <[email protected]>
--- fs/btrfs/dir-item.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/dir-item.c +4 -2
@@ -474,8 +474,10 @@ int verify_dir_item(struct btrfs_root *root, }/* BTRFS_MAX_XATTR_SIZE is the same for all dir items */ -if (btrfs_dir_data_len (leaf, dir_item) >BTRFS_MAX_XATTR_SIZE (root)) { -printk (KERN_CRIT "btrfs: invalid dir item data len: %u\n" , +if ((btrfs_dir_data_len (leaf, dir_item) + +btrfs_dir_name_len (leaf, dir_item)) >BTRFS_MAX_XATTR_SIZE (root)) { +printk (KERN_CRIT "btrfs: invalid dir item name + data len: %u + %u\n" , + (unsigned )btrfs_dir_name_len (leaf, dir_item), (unsigned )btrfs_dir_data_len (leaf, dir_item));return 1 ; }
Signature · 1 line
1.7.9.5