]> git.itanic.dy.fi Git - linux-stable/commitdiff
ext4: correct max_inline_xattr_value_size computing
authorBaokun Li <libaokun1@huawei.com>
Thu, 16 Jun 2022 02:13:57 +0000 (10:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:24:27 +0000 (14:24 +0200)
[ Upstream commit c9fd167d57133c5b748d16913c4eabc55e531c73 ]

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: Sasha Levin <sashal@kernel.org>
fs/ext4/inline.c

index 28bc431cf5ba82c34cc0eb0e6a78af797db7e1fe..38ad09e802e4890a5660788fe979d20775103316 100644 (file)
@@ -35,6 +35,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 -