leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries()

Browse Source 
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: Eric Biggers <ebiggers@google.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Eric Biggers 2017-04-29 23:56:52 -04:00 committed by Theodore Ts'o
parent ba7ea1d8f4
commit 2c4f992337
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ext4/xattr.c
View File

@ -162,7 +162,7 @@ ext4_xattr_handler(int name_index)
} }
static int 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) void *value_start)
{ {
struct ext4_xattr_entry *e = entry; struct ext4_xattr_entry *e = entry;
@ -217,7 +217,7 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh)
return -EFSCORRUPTED; return -EFSCORRUPTED;
if (!ext4_xattr_block_csum_verify(inode, bh)) if (!ext4_xattr_block_csum_verify(inode, bh))
return -EFSBADCRC; 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); bh->b_data);
if (!error) if (!error)
set_buffer_verified(bh); 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) || if (end - (void *)header < sizeof(*header) + sizeof(u32) ||
(header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC))) (header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)))
goto errout; goto errout;
error = ext4_xattr_check_names(IFIRST(header), end, IFIRST(header)); error = ext4_xattr_check_entries(IFIRST(header), end, IFIRST(header));
errout: errout:
if (error) if (error)
__ext4_error_inode(inode, function, line, 0, __ext4_error_inode(inode, function, line, 0,