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

Commit 2c4f9923 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries() 



ext4_xattr_check_names() actually validates both the xattr names and
values, not just the names.  So rename it to ext4_xattr_check_entries()
to avoid confusion.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent ba7ea1d8

fs/ext4/xattr.c

+5 −5
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ ext4_xattr_handler(int name_index) 
}



static int

ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,

ext4_xattr_check_entries(struct ext4_xattr_entry *entry, void *end,

			 void *value_start)

{

	struct ext4_xattr_entry *e = entry;
@@ -217,7 +217,7 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh) 
		return -EFSCORRUPTED;

	if (!ext4_xattr_block_csum_verify(inode, bh))

		return -EFSBADCRC;

	error = ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size,

	error = ext4_xattr_check_entries(BFIRST(bh), bh->b_data + bh->b_size,

					 bh->b_data);

	if (!error)

		set_buffer_verified(bh);
@@ -233,7 +233,7 @@ __xattr_check_inode(struct inode *inode, struct ext4_xattr_ibody_header *header, 
	if (end - (void *)header < sizeof(*header) + sizeof(u32) ||

	    (header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)))

		goto errout;

	error = ext4_xattr_check_names(IFIRST(header), end, IFIRST(header));

	error = ext4_xattr_check_entries(IFIRST(header), end, IFIRST(header));

errout:

	if (error)

		__ext4_error_inode(inode, function, line, 0,