From: Baokun Li <libaokun1@huawei.com>
Date: Thu, 16 Jun 2022 02:13:57 +0000 (+0800)
Subject: ext4: correct max_inline_xattr_value_size computing
X-Git-Tag: baikal/mips/sdk5.9~36
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=3797d70611eecc9246f4dde02865b5f654d7a84d;p=kernel.git

ext4: correct max_inline_xattr_value_size computing

[ Upstream commit feb83094106ad6a4ae16f2c6819c82d09509c1d3 ]

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>
---

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 28bc431cf5ba8..38ad09e802e48 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -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 -