linux-kernel - Re: [PATCH 03/13] ext4: correct return value of ext4_convert_meta

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: <20230816030044.GI2247938@mit.edu>
Date:   Tue, 15 Aug 2023 23:00:44 -0400
From:   "Theodore Ts'o" <tytso@....edu>
To:     Kemeng Shi <shikemeng@...weicloud.com>
Cc:     adilger.kernel@...ger.ca, linux-ext4@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH 03/13] ext4: correct return value of ext4_convert_meta_bg

On Thu, Jun 29, 2023 at 08:00:34PM +0800, Kemeng Shi wrote:
> We return error in "ret", so collect previous error in "ret" instead
> of "err" or previous error will be ignored.
> 
> Signed-off-by: Kemeng Shi <shikemeng@...weicloud.com>
> ---
>  fs/ext4/resize.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
> index 7cbc695b7005..0b3d8c808de1 100644
> --- a/fs/ext4/resize.c
> +++ b/fs/ext4/resize.c
> @@ -1984,8 +1984,8 @@ static int ext4_convert_meta_bg(struct super_block *sb, struct inode *inode)
>  
>  errout:
>  	ret = ext4_journal_stop(handle);
> -	if (!err)
> -		err = ret;
> +	if (!ret)
> +		ret = err;
>  	return ret;

If there is a previous error in "err", I think we would want to
prioritize returning that error, as opposed to the potential error
from ext4_journal_stop().  So how about this instead?

errout:
	ret = ext4_journal_stop(handle);
	if (!err)
		ret = err;
	return ret;


						- Ted