05.09.2023 19:23, Peter Xu:
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.

Ping?  Has this been forgotten?

Thanks,

/mjt

Cc: qemu-sta...@nongnu.org # v4.0+
Fixes: d2f1d29b95 ("migration: add support for a "tls-authz" migration 
parameter")
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Reviewed-by: Fabiano Rosas <faro...@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Signed-off-by: Peter Xu <pet...@redhat.com>
---
  migration/options.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/migration/options.c b/migration/options.c
index 1d1e1321b0..6bbfd4853d 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);


Reply via email to