Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46f5388 authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

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: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 9b011adf

fs/btrfs/dir-item.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

	}