linux-ext4 - Re: ext4/super.c : Fix a goto label

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]

Date:   Mon, 28 Aug 2023 09:18:26 -0700
From:   "Darrick J. Wong" <djwong@...nel.org>
To:     Haibo Liu <haiboliu6@...il.com>
Cc:     linux-ext4@...r.kernel.org
Subject: Re: ext4/super.c : Fix a goto label

On Mon, Aug 28, 2023 at 05:27:26PM +0800, Haibo Liu wrote:
> There are 9 goto labels in ext4_init_fs: out,out05,out1,out2,out3,out4,out5,out6,out7. So I feel that replacing out5 with out0 may be better. 

...then why not replace them all with descriptions of what gets released
under each label?

	ret = init_inodecache();
	if (ret)
		goto out_unregister_mballoc;
	ret = init_somethingelse();
	if (ret)
		goto out_inodecache;

out_unregister_ext23:
	unregister_as_ext2();
	unregister_as_ext3();
out_inodecache:
	destroy_inodecache();
out_mballoc:
	ext4_exit_mballoc();

Is much more easier to understand than out[0...N], yes?

--D

> Signed-off-by: Haibo Liu <haiboliu6@...il.com>
> ---
>  fs/ext4/super.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 03373471131c..115bbbd95a7b 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -6696,7 +6696,7 @@ static int __init ext4_init_fs(void)
>  
>  	err = ext4_fc_init_dentry_cache();
>  	if (err)
> -		goto out05;
> +		goto out0;
>  
>  	register_as_ext3();
>  	register_as_ext2();
> @@ -6708,7 +6708,7 @@ static int __init ext4_init_fs(void)
>  out:
>  	unregister_as_ext2();
>  	unregister_as_ext3();
> -out05:
> +out0:
>  	destroy_inodecache();
>  out1:
>  	ext4_exit_mballoc();
> -- 
> 2.34.1
>