OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration/qmp: Fix crash on setting tls-authz with null

Browse Source 
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>
This commit is contained in:
Peter Xu 2023-09-05 12:23:32 -04:00 committed by Juan Quintela
parent 0ad0d9dcd1
commit 86dec715a7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
migration/options.c
View File

@ -1408,20 +1408,25 @@ void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
{ {
MigrationParameters tmp; MigrationParameters tmp;
/* TODO Rewrite "" to null instead */ /* TODO Rewrite "" to null instead for all three tls_* parameters */
if (params->tls_creds if (params->tls_creds
&& params->tls_creds->type == QTYPE_QNULL) { && params->tls_creds->type == QTYPE_QNULL) {
qobject_unref(params->tls_creds->u.n); qobject_unref(params->tls_creds->u.n);
params->tls_creds->type = QTYPE_QSTRING; params->tls_creds->type = QTYPE_QSTRING;
params->tls_creds->u.s = strdup(""); params->tls_creds->u.s = strdup("");
} }
/* TODO Rewrite "" to null instead */
if (params->tls_hostname if (params->tls_hostname
&& params->tls_hostname->type == QTYPE_QNULL) { && params->tls_hostname->type == QTYPE_QNULL) {
qobject_unref(params->tls_hostname->u.n); qobject_unref(params->tls_hostname->u.n);
params->tls_hostname->type = QTYPE_QSTRING; params->tls_hostname->type = QTYPE_QSTRING;
params->tls_hostname->u.s = strdup(""); 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); migrate_params_test_apply(params, &tmp);