lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 1122/1157] ext4: correct the misjudgment in ext4_iget_extra_inode
    Date
    From: Baokun Li <libaokun1@huawei.com>

    [ 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>
    ---
    fs/ext4/inode.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
    index 0ccff6214fc8..2ad139d78574 100644
    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -4692,8 +4692,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);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:58    [W:4.745 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site