diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-04-29 23:56:52 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-04-29 23:56:52 -0400 |
| commit | 2c4f9923374843384cfd3a2edc0f02c19a7a29e2 (patch) | |
| tree | 14cb6c83a5674bb046b117b4f550a705daf61bc2 /fs/ext4 | |
| parent | ba7ea1d8f45383cb88858057e9bf60cd8cf3b898 (diff) | |
| download | linux-2c4f9923374843384cfd3a2edc0f02c19a7a29e2.tar.bz2 | |
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: Eric Biggers <ebiggers@google.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/xattr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 8e9d0d4c6234..c5a3e98bd74d 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -162,8 +162,8 @@ ext4_xattr_handler(int name_index) } static int -ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end, - void *value_start) +ext4_xattr_check_entries(struct ext4_xattr_entry *entry, void *end, + void *value_start) { struct ext4_xattr_entry *e = entry; @@ -217,8 +217,8 @@ 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, - bh->b_data); + error = ext4_xattr_check_entries(BFIRST(bh), bh->b_data + bh->b_size, + bh->b_data); if (!error) set_buffer_verified(bh); return error; @@ -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, |