Commit f853465a authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

block: Make remaining uses of qobject input visitor more robust 



Remaining uses of qobject_input_visitor_new_keyval() in the block
subsystem:

* block_crypto_open_opts_init()
  Currently doesn't visit any non-string scalars, thus safe.  It's
  called from
  - block_crypto_open_luks()
    Creates the QDict with qemu_opts_to_qdict_filtered(), which
    creates only string scalars, but has a TODO asking for other types.
  - qcow_open()
  - qcow2_open(), qcow2_co_invalidate_cache(), qcow2_reopen_prepare()

* block_crypto_create_opts_init(), called from
  - block_crypto_co_create_opts_luks()
    Also creates the QDict with qemu_opts_to_qdict_filtered().

* vdi_co_create_opts()
  Also creates the QDict with qemu_opts_to_qdict_filtered().

Replace these uses by qobject_input_visitor_new_flat_confused() for
robustness.  This adds crumpling.  Right now, that's a no-op, but if
we ever extend these things in non-flat ways, crumpling will be
needed.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent af91062e

block/crypto.c

+9 −3
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
#include "qemu/osdep.h"



#include "block/block_int.h"

#include "block/qdict.h"

#include "sysemu/block-backend.h"

#include "crypto/block.h"

#include "qapi/opts-visitor.h"

#include "qapi/qapi-visit-crypto.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qobject-input-visitor.h"

#include "qapi/error.h"

#include "qemu/option.h"
@@ -159,7 +159,10 @@ block_crypto_open_opts_init(QCryptoBlockFormat format, 
    ret = g_new0(QCryptoBlockOpenOptions, 1);

    ret->format = format;



    v = qobject_input_visitor_new_keyval(QOBJECT(opts));

    v = qobject_input_visitor_new_flat_confused(opts, &local_err);

    if (local_err) {

        goto out;

    }



    visit_start_struct(v, NULL, NULL, 0, &local_err);

    if (local_err) {
@@ -210,7 +213,10 @@ block_crypto_create_opts_init(QCryptoBlockFormat format, 
    ret = g_new0(QCryptoBlockCreateOptions, 1);

    ret->format = format;



    v = qobject_input_visitor_new_keyval(QOBJECT(opts));

    v = qobject_input_visitor_new_flat_confused(opts, &local_err);

    if (local_err) {

        goto out;

    }



    visit_start_struct(v, NULL, NULL, 0, &local_err);

    if (local_err) {

block/vdi.c

+6 −2
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ 


#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qobject-input-visitor.h"

#include "qapi/qapi-visit-block-core.h"

#include "block/block_int.h"

#include "block/qdict.h"

#include "sysemu/block-backend.h"

#include "qemu/module.h"

#include "qemu/option.h"
@@ -934,7 +934,11 @@ static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts *opts, 
    }



    /* Get the QAPI object */

    v = qobject_input_visitor_new_keyval(QOBJECT(qdict));

    v = qobject_input_visitor_new_flat_confused(qdict, errp);

    if (!v) {

        ret = -EINVAL;

        goto done;

    }

    visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);

    visit_free(v);