diff options
| author | Baokun Li <libaokun1@huawei.com> | 2022-06-16 10:13:58 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-17 14:24:27 +0200 |
| commit | 9a080f8b085a8171a48c0c5a11f901596ee7f8f8 (patch) | |
| tree | 1f314198838f215d75f7d434c8fbbc1eedb9422c | |
| parent | 7dbba79169201e4291192ac5070c34c244498108 (diff) | |
| download | linux-stable-9a080f8b085a8171a48c0c5a11f901596ee7f8f8.tar.gz linux-stable-9a080f8b085a8171a48c0c5a11f901596ee7f8f8.tar.bz2 linux-stable-9a080f8b085a8171a48c0c5a11f901596ee7f8f8.zip | |
ext4: correct the misjudgment in ext4_iget_extra_inode
[ Upstream commit fd7e672ea98b95b9d4c9dae316639f03c16a749d ]
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: 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-5-libaokun1@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/ext4/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 149377c849ee..f95c73defe05 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4516,8 +4516,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); |