This is a note to let you know that I've just added the patch titled
ext4: correct the misjudgment in ext4_iget_extra_inode
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-correct-the-misjudgment-in-ext4_iget_extra_inode.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fd7e672ea98b95b9d4c9dae316639f03c16a749d Mon Sep 17 00:00:00 2001
From: Baokun Li <libaokun1@xxxxxxxxxx>
Date: Thu, 16 Jun 2022 10:13:58 +0800
Subject: ext4: correct the misjudgment in ext4_iget_extra_inode
From: Baokun Li <libaokun1@xxxxxxxxxx>
commit fd7e672ea98b95b9d4c9dae316639f03c16a749d upstream.
Use the EXT4_INODE_HAS_XATTR_SPACE macro to more accurately
determine whether the inode have xattr space.
Cc: stable@xxxxxxxxxx
Signed-off-by: Baokun Li <libaokun1@xxxxxxxxxx>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@xxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Link: https://lore.kernel.org/r/20220616021358.2504451-5-libaokun1@xxxxxxxxxx
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/ext4/inode.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4615,8 +4615,7 @@ static inline int ext4_iget_extra_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);
Patches currently in stable-queue which might be from libaokun1@xxxxxxxxxx are
queue-5.10/ext4-correct-max_inline_xattr_value_size-computing.patch
queue-5.10/ext4-fix-use-after-free-in-ext4_xattr_set_entry.patch
queue-5.10/ext4-correct-the-misjudgment-in-ext4_iget_extra_inode.patch
queue-5.10/ext4-add-ext4_inode_has_xattr_space-macro-in-xattr.h.patch
