Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vboxsf: Avoid an spurious warning if load_nls_xxx() fails

Browse source 
commit de3f64b738af57e2732b91a0774facc675b75b54 upstream.

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@wanadoo.fr>
Link: https://lore.kernel.org/r/d09eaaa4e2e08206c58a1a27ca9b3e81dc168773.1698835730.git.christophe.jaillet@wanadoo.fr
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET 2023-11-01 11:49:48 +01:00 committed by Ksawlii
parent 01d43d74f4
commit 82c1558e7b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/vboxsf/super.c
View file

@ -151,7 +151,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
if (!sbi->nls) { if (!sbi->nls) {
vbg_err("vboxsf: Count not load '%s' nls\n", nls_name); vbg_err("vboxsf: Count not load '%s' nls\n", nls_name);
err = -EINVAL; err = -EINVAL;
goto fail_free; goto fail_destroy_idr;
} }
} }
@ -224,6 +224,7 @@ fail_free:
ida_simple_remove(&vboxsf_bdi_ida, sbi->bdi_id); ida_simple_remove(&vboxsf_bdi_ida, sbi->bdi_id);
if (sbi->nls) if (sbi->nls)
unload_nls(sbi->nls); unload_nls(sbi->nls);
fail_destroy_idr:
idr_destroy(&sbi->ino_idr); idr_destroy(&sbi->ino_idr);
kfree(sbi); kfree(sbi);
return err; return err;