summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorBaokun Li <libaokun1@huawei.com>2022-06-16 05:13:57 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-21 16:16:24 +0300
commit603fb7bd744ae2710568cf18816d5b494277afaf (patch)
treea0a41b9ecaf28316b667244cde7148bd9236983a /fs
parente8c747496f23e2cf152899e35de2f25ce647d72b (diff)
downloadlinux-603fb7bd744ae2710568cf18816d5b494277afaf.tar.xz
ext4: correct max_inline_xattr_value_size computing
commit c9fd167d57133c5b748d16913c4eabc55e531c73 upstream. If the ext4 inode does not have xattr space, 0 is returned in the get_max_inline_xattr_value_size function. Otherwise, the function returns a negative value when the inode does not contain EXT4_STATE_XATTR. Cc: stable@kernel.org Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20220616021358.2504451-4-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/inline.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index fbad4180514c..88bd1d1cca23 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -34,6 +34,9 @@ static int get_max_inline_xattr_value_size(struct inode *inode,
struct ext4_inode *raw_inode;
int free, min_offs;
+ if (!EXT4_INODE_HAS_XATTR_SPACE(inode))
+ return 0;
+
min_offs = EXT4_SB(inode->i_sb)->s_inode_size -
EXT4_GOOD_OLD_INODE_SIZE -
EXT4_I(inode)->i_extra_isize -