Hi Christophe,
On 11/1/23 11:49, Christophe JAILLET wrote:
> If an load_nls_xxx() function fails a few lines above, the 'sbi->bdi_id' is
> still 0.
> So, in the error handling path, we will call ida_simple_remove(..., 0)
> which is not allocated yet.
>
> In order to prevent a spurious "ida_free called for id=0 which is not
> allocated." message, tweak the error handling path and add a new label.
>
> Fixes: 0fd169576648 ("fs: Add VirtualBox guest shared folder (vboxsf) support")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Thank you, both patches look good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
for the series.
Regards,
Hans
> ---
> fs/vboxsf/super.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c
> index 1fb8f4df60cb..9848af78215b 100644
> --- a/fs/vboxsf/super.c
> +++ b/fs/vboxsf/super.c
> @@ -151,7 +151,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
> if (!sbi->nls) {
> vbg_err("vboxsf: Count not load '%s' nls\n", nls_name);
> err = -EINVAL;
> - goto fail_free;
> + goto fail_destroy_idr;
> }
> }
>
> @@ -224,6 +224,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
> ida_simple_remove(&vboxsf_bdi_ida, sbi->bdi_id);
> if (sbi->nls)
> unload_nls(sbi->nls);
> +fail_destroy_idr:
> idr_destroy(&sbi->ino_idr);
> kfree(sbi);
> return err;
