Re: [PATCH] btrfs: prevent memory leak in super.c

From: Nikolay Borisov
Date: Tue Sep 24 2019 - 03:43:22 EST




On 24.09.19 Ð. 1:57 Ñ., Navid Emamdoost wrote:
> In btrfs_mount_root the last error checking was not going to the error
> handling path. Fixed it.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@xxxxxxxxx>

NAK

deactivate_locked_super actually calls btrfs_kill_super which in turn
calls generic_shutdown_super which does the required shutdown sequence.

> ---
> fs/btrfs/super.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 1b151af25772..9f3f62c000fa 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -1565,7 +1565,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
> security_free_mnt_opts(&new_sec_opts);
> if (error) {
> deactivate_locked_super(s);
> - return ERR_PTR(error);
> + goto error_close_devices;
> }
>
> return dget(s->s_root);
>