Commit ec9c10d2 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

blockdev: fix drive_init() opts and bs_opts leaks 



These memory leaks also make drive_add if=none,id=drive0 without a file=
option leak the options list.  This keeps ID "drive0" around forever.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent db5dc557

blockdev.c

+15 −12
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
    qemu_opts_absorb_qdict(opts, bs_opts, &error);

    if (error_is_set(&error)) {

        error_propagate(errp, error);

        return NULL;

        goto early_err;

    }



    if (id) {
@@ -361,7 +361,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
    if ((buf = qemu_opt_get(opts, "discard")) != NULL) {

        if (bdrv_parse_discard_flags(buf, &bdrv_flags) != 0) {

            error_setg(errp, "invalid discard option");

            return NULL;

            goto early_err;

        }

    }
@@ -383,7 +383,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
            /* this is the default */

        } else {

           error_setg(errp, "invalid aio option");

           return NULL;

           goto early_err;

        }

    }

#endif
@@ -393,13 +393,13 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
            error_printf("Supported formats:");

            bdrv_iterate_format(bdrv_format_print, NULL);

            error_printf("\n");

            return NULL;

            goto early_err;

        }



        drv = bdrv_find_format(buf);

        if (!drv) {

            error_setg(errp, "'%s' invalid format", buf);

            return NULL;

            goto early_err;

        }

    }
@@ -435,20 +435,20 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 


    if (!check_throttle_config(&cfg, &error)) {

        error_propagate(errp, error);

        return NULL;

        goto early_err;

    }



    on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;

    if ((buf = qemu_opt_get(opts, "werror")) != NULL) {

        if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {

            error_setg(errp, "werror is not supported by this bus type");

            return NULL;

            goto early_err;

        }



        on_write_error = parse_block_error_action(buf, 0, &error);

        if (error_is_set(&error)) {

            error_propagate(errp, error);

            return NULL;

            goto early_err;

        }

    }
@@ -456,13 +456,13 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
    if ((buf = qemu_opt_get(opts, "rerror")) != NULL) {

        if (type != IF_IDE && type != IF_VIRTIO && type != IF_SCSI && type != IF_NONE) {

            error_report("rerror is not supported by this bus type");

            return NULL;

            goto early_err;

        }



        on_read_error = parse_block_error_action(buf, 1, &error);

        if (error_is_set(&error)) {

            error_propagate(errp, error);

            return NULL;

            goto early_err;

        }

    }
@@ -491,6 +491,8 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
        if (has_driver_specific_opts) {

            file = NULL;

        } else {

            QDECREF(bs_opts);

            qemu_opts_del(opts);

            return dinfo;

        }

    }
@@ -529,12 +531,13 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
    return dinfo;



err:

    qemu_opts_del(opts);

    QDECREF(bs_opts);

    bdrv_unref(dinfo->bdrv);

    g_free(dinfo->id);

    QTAILQ_REMOVE(&drives, dinfo, next);

    g_free(dinfo);

early_err:

    QDECREF(bs_opts);

    qemu_opts_del(opts);

    return NULL;

}