Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8887ef07 authored by Baokun Li's avatar Baokun Li Committed by Greg Kroah-Hartman
Browse files

ext4: correct the misjudgment in ext4_iget_extra_inode 



commit fd7e672ea98b95b9d4c9dae316639f03c16a749d upstream.

Use the EXT4_INODE_HAS_XATTR_SPACE macro to more accurately
determine whether the inode have xattr space.

Cc: stable@kernel.org
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220616021358.2504451-5-libaokun1@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be9614e1

fs/ext4/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -4841,8 +4841,7 @@ static inline int ext4_iget_extra_inode(struct inode *inode, 
	__le32 *magic = (void *)raw_inode +

			EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize;



	if (EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize + sizeof(__le32) <=

	    EXT4_INODE_SIZE(inode->i_sb) &&

	if (EXT4_INODE_HAS_XATTR_SPACE(inode)  &&

	    *magic == cpu_to_le32(EXT4_XATTR_MAGIC)) {

		ext4_set_inode_state(inode, EXT4_STATE_XATTR);

		return ext4_find_inline_data_nolock(inode);