linux-kernel - Re: [PATCH v3 4/4] ext4: correct the misjudgment in ext4_iget_extra

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220616040829.kb66mg2dnitnlkau@riteshh-domain>
Date:   Thu, 16 Jun 2022 09:38:29 +0530
From:   Ritesh Harjani <ritesh.list@...il.com>
To:     Baokun Li <libaokun1@...wei.com>
Cc:     linux-ext4@...r.kernel.org, tytso@....edu,
        adilger.kernel@...ger.ca, jack@...e.cz, lczerner@...hat.com,
        enwlinux@...il.com, linux-kernel@...r.kernel.org,
        yi.zhang@...wei.com, yebin10@...wei.com, yukuai3@...wei.com
Subject: Re: [PATCH v3 4/4] ext4: correct the misjudgment in
 ext4_iget_extra_inode

On 22/06/16 10:13AM, Baokun Li wrote:
> Use the EXT4_INODE_HAS_XATTR_SPACE macro to more accurately
> determine whether the inode have xattr space.

Right. I also noticed there are few places in fs/ext4/xattr.c
and in fs/ext4/inline.c where sizeof(__u32) is being used which (I think)
should be EXT4_XATTR_PAD. But that need not be part of this patch series.

Looks good to me. Feel free to add -
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@...il.com>

>
> Signed-off-by: Baokun Li <libaokun1@...wei.com>
> ---
>  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 53877ffe3c41..ae463cd9b405 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -4687,8 +4687,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.31.1
>