Messages in this thread | | | Subject | Re: [PATCH 1/3] hfs: add missing clean-up in hfs_fill_super | From | Viacheslav Dubeyko <> | Date | Wed, 30 Jun 2021 09:49:26 -0700 |
| |
> On Jun 29, 2021, at 9:50 PM, Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com> wrote:
<skipped>
> Thanks for the suggestion. Since the bail and bail_no_root error paths are used before hfs_find_init and after hfs_find_exit are called in the normal execution case, moving hfs_find_exit under the bail label wouldn't work. > > Perhaps this can be done by introducing another goto label. Any thoughts on the following? > > 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:
Makes sense. Looks good.
Thanks, Slava.
| |