Commit eaf944a4 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

blkdebug: Don't leak bs->file on failure 



Reported-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent 5f5bcd80

block/blkdebug.c

+9 −5
Original line number Diff line number Diff line
@@ -396,14 +396,14 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;

        goto out;

    }



    /* Read rules from config file or command line options */

    config = qemu_opt_get(opts, "config");

    ret = read_config(s, config, options, errp);

    if (ret) {

        goto fail;

        goto out;

    }



    /* Set initial state */
@@ -414,7 +414,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
                          flags, true, false, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        goto fail;

        goto out;

    }



    /* Set request alignment */
@@ -424,11 +424,15 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    } else {

        error_setg(errp, "Invalid alignment");

        ret = -EINVAL;

        goto fail;

        goto fail_unref;

    }



    ret = 0;

fail:

    goto out;



fail_unref:

    bdrv_unref(bs->file);

out:

    qemu_opts_del(opts);

    return ret;

}