linux-kernel - Re: [PATCH v2] btrfs: normalize the error handling branch in btrfs_init

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: <351a524a-3739-e9f3-3b20-0854e8b2a1af@gmx.com>
Date:   Tue, 22 Nov 2022 19:59:53 +0800
From:   Qu Wenruo <quwenruo.btrfs@....com>
To:     Zhen Lei <thunder.leizhen@...wei.com>, Chris Mason <clm@...com>,
        Josef Bacik <josef@...icpanda.com>,
        David Sterba <dsterba@...e.com>, linux-btrfs@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] btrfs: normalize the error handling branch in
 btrfs_init_sysfs()



On 2022/11/22 19:50, Zhen Lei wrote:
> Although kset_unregister() can eventually remove all attribute files,
> explicitly rolling back with the matching function makes the code logic
> look clearer.
> 
> Signed-off-by: Zhen Lei <thunder.leizhen@...wei.com>

Reviewed-by: Qu Wenruo <wqu@...e.com>

Thanks,
Qu

> ---
>   fs/btrfs/sysfs.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> v1 --> v2:
> 1. Add sysfs_unmerge_group() to unmerge group first.
> 2. Update subject and commit message, no resource leaks.
> 
> diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
> index 699b54b3acaae0b..74fef1f49c358cd 100644
> --- a/fs/btrfs/sysfs.c
> +++ b/fs/btrfs/sysfs.c
> @@ -2321,8 +2321,11 @@ int __init btrfs_init_sysfs(void)
>   
>   #ifdef CONFIG_BTRFS_DEBUG
>   	ret = sysfs_create_group(&btrfs_kset->kobj, &btrfs_debug_feature_attr_group);
> -	if (ret)
> -		goto out2;
> +	if (ret) {
> +		sysfs_unmerge_group(&btrfs_kset->kobj,
> +				    &btrfs_static_feature_attr_group);
> +		goto out_remove_group;
> +	}
>   #endif
>   
>   	return 0;