linux-kernel - Re: [PATCH v2 1/3] hfs: add missing clean-up in hfs_fill

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:   Thu, 1 Jul 2021 10:03:50 -0700
From:   Viacheslav Dubeyko <slava@...eyko.com>
To:     Desmond Cheong Zhi Xi <desmondcheongzx@...il.com>
Cc:     gustavoars@...nel.org, Al Viro <viro@...iv.linux.org.uk>,
        Linux FS Devel <linux-fsdevel@...r.kernel.org>,
        LKML <linux-kernel@...r.kernel.org>, skhan@...uxfoundation.org,
        gregkh@...uxfoundation.org,
        linux-kernel-mentees@...ts.linuxfoundation.org,
        Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [PATCH v2 1/3] hfs: add missing clean-up in hfs_fill_super



> On Jun 30, 2021, at 8:07 PM, Desmond Cheong Zhi Xi <desmondcheongzx@...il.com> wrote:
> 
> Before exiting hfs_fill_super, the struct hfs_find_data used in
> hfs_find_init should be passed to hfs_find_exit to be cleaned up, and
> to release the lock held on the btree.
> 
> The call to hfs_find_exit is missing from an error path. We add it
> back in by consolidating calls to hfs_find_exit for error paths.
> 
> Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@...il.com>
> ---
> fs/hfs/super.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/hfs/super.c b/fs/hfs/super.c
> index 44d07c9e3a7f..12d9bae39363 100644
> --- a/fs/hfs/super.c
> +++ b/fs/hfs/super.c
> @@ -420,14 +420,12 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
> 	if (!res) {
> 		if (fd.entrylength > sizeof(rec) || fd.entrylength < 0) {
> 			res =  -EIO;
> -			goto bail;
> +			goto bail_hfs_find;
> 		}
> 		hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, fd.entrylength);
> 	}
> -	if (res) {
> -		hfs_find_exit(&fd);
> -		goto bail_no_root;
> -	}
> +	if (res)
> +		goto bail_hfs_find;
> 	res = -EINVAL;
> 	root_inode = hfs_iget(sb, &fd.search_key->cat, &rec);
> 	hfs_find_exit(&fd);
> @@ -443,6 +441,8 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
> 	/* everything's okay */
> 	return 0;
> 
> +bail_hfs_find:
> +	hfs_find_exit(&fd);
> bail_no_root:
> 	pr_err("get root inode failed\n");
> bail:
> -- 
> 2.25.1
> 

Looks good.

Reviewed-by: Viacheslav Dubeyko <slava@...eyko.com>

Thanks,
Slava.