Commit 9bb21ced authored by Tahsin Erdogan's avatar Tahsin Erdogan Committed by Theodore Ts'o
Browse files

ext4: fix ext4_xattr_make_inode_space() value size calculation 



ext4_xattr_make_inode_space() is interested in calculating the inline
space used in an inode. When a xattr entry refers to an external inode
the value size indicates the external inode size, not the value size in
the inline area. Change the function to take this into account.

Signed-off-by: default avatarTahsin Erdogan <tahsin@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 0bd454c0

fs/ext4/xattr.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -1745,9 +1745,10 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, 
		last = IFIRST(header);

		last = IFIRST(header);

		/* Find the entry best suited to be pushed into EA block */

		/* Find the entry best suited to be pushed into EA block */

		for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {

		for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {

			total_size =

			total_size = EXT4_XATTR_LEN(last->e_name_len);

			EXT4_XATTR_SIZE(le32_to_cpu(last->e_value_size)) +

			if (!last->e_value_inum)

					EXT4_XATTR_LEN(last->e_name_len);

				total_size += EXT4_XATTR_SIZE(

					       le32_to_cpu(last->e_value_size));

			if (total_size <= bfree &&

			if (total_size <= bfree &&

			    total_size < min_total_size) {

			    total_size < min_total_size) {

				if (total_size + ifree < isize_diff) {

				if (total_size + ifree < isize_diff) {
@@ -1766,8 +1767,10 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, 
		}

		}





		entry_size = EXT4_XATTR_LEN(entry->e_name_len);

		entry_size = EXT4_XATTR_LEN(entry->e_name_len);

		total_size = entry_size +

		total_size = entry_size;

			EXT4_XATTR_SIZE(le32_to_cpu(entry->e_value_size));

		if (!entry->e_value_inum)

			total_size += EXT4_XATTR_SIZE(

					      le32_to_cpu(entry->e_value_size));

		error = ext4_xattr_move_to_block(handle, inode, raw_inode,

		error = ext4_xattr_move_to_block(handle, inode, raw_inode,

						 entry);

						 entry);

		if (error)

		if (error)

CRA Git | Maintained and supported by SUSTech CRA and CCSE