diff options
| author | Peter Xu <peterx@redhat.com> | 2023-09-05 12:23:32 -0400 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-11 11:17:02 +0200 |
| commit | 86dec715a7339fc61c3bdb9715993b277b2089db (patch) | |
| tree | 7699c892aa53e899d93ba39d035eda808d5ccbcd /migration/options.c | |
| parent | 0ad0d9dcd16f2ea816a413008ac5191ebef45c95 (diff) | |
| download | qemu-86dec715a7339fc61c3bdb9715993b277b2089db.zip qemu-86dec715a7339fc61c3bdb9715993b277b2089db.tar.gz qemu-86dec715a7339fc61c3bdb9715993b277b2089db.tar.bz2 | |
migration/qmp: Fix crash on setting tls-authz with null
QEMU will crash if anyone tries to set tls-authz (which is a type
StrOrNull) with 'null' value. Fix it in the easy way by converting it to
qstring just like the other two tls parameters.
Cc: qemu-stable@nongnu.org # v4.0+
Fixes: d2f1d29b95 ("migration: add support for a "tls-authz" migration parameter")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230905162335.235619-2-peterx@redhat.com>
Diffstat (limited to 'migration/options.c')
| -rw-r--r-- | migration/options.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/migration/options.c b/migration/options.c index 1d1e132..6bbfd48 100644 --- a/migration/options.c +++ b/migration/options.c @@ -1408,20 +1408,25 @@ void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) { MigrationParameters tmp; - /* TODO Rewrite "" to null instead */ + /* TODO Rewrite "" to null instead for all three tls_* parameters */ if (params->tls_creds && params->tls_creds->type == QTYPE_QNULL) { qobject_unref(params->tls_creds->u.n); params->tls_creds->type = QTYPE_QSTRING; params->tls_creds->u.s = strdup(""); } - /* TODO Rewrite "" to null instead */ if (params->tls_hostname && params->tls_hostname->type == QTYPE_QNULL) { qobject_unref(params->tls_hostname->u.n); params->tls_hostname->type = QTYPE_QSTRING; params->tls_hostname->u.s = strdup(""); } + if (params->tls_authz + && params->tls_authz->type == QTYPE_QNULL) { + qobject_unref(params->tls_authz->u.n); + params->tls_authz->type = QTYPE_QSTRING; + params->tls_authz->u.s = strdup(""); + } migrate_params_test_apply(params, &tmp); |