All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Juan Quintela <quintela@redhat.com>,
	peterx@redhat.com,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
	Manish Mishra <manish.mishra@nutanix.com>,
	"Daniel P . Berrange" <berrange@redhat.com>
Subject: [PATCH v9 08/14] migration: Export tls-[creds|hostname|authz] params to cmdline too
Date: Thu,  7 Jul 2022 14:55:15 -0400	[thread overview]
Message-ID: <20220707185515.27475-1-peterx@redhat.com> (raw)
In-Reply-To: <20220707185342.26794-1-peterx@redhat.com>

It's useful for specifying tls credentials all in the cmdline (along with
the -object tls-creds-*), especially for debugging purpose.

The trick here is we must remember to not free these fields again in the
finalize() function of migration object, otherwise it'll cause double-free.

The thing is when destroying an object, we'll first destroy the properties
that bound to the object, then the object itself.  To be explicit, when
destroy the object in object_finalize() we have such sequence of
operations:

    object_property_del_all(obj);
    object_deinit(obj, ti);

So after this change the two fields are properly released already even
before reaching the finalize() function but in object_property_del_all(),
hence we don't need to free them anymore in finalize() or it's double-free.

This also fixes a trivial memory leak for tls-authz as we forgot to free it
before this patch.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/migration.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index fe77c7d0ef..76cf2a72c0 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -4365,6 +4365,9 @@ static Property migration_properties[] = {
                       DEFAULT_MIGRATE_ANNOUNCE_STEP),
     DEFINE_PROP_BOOL("x-postcopy-preempt-break-huge", MigrationState,
                       postcopy_preempt_break_huge, true),
+    DEFINE_PROP_STRING("tls-creds", MigrationState, parameters.tls_creds),
+    DEFINE_PROP_STRING("tls-hostname", MigrationState, parameters.tls_hostname),
+    DEFINE_PROP_STRING("tls-authz", MigrationState, parameters.tls_authz),
 
     /* Migration capabilities */
     DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
@@ -4402,12 +4405,9 @@ static void migration_class_init(ObjectClass *klass, void *data)
 static void migration_instance_finalize(Object *obj)
 {
     MigrationState *ms = MIGRATION_OBJ(obj);
-    MigrationParameters *params = &ms->parameters;
 
     qemu_mutex_destroy(&ms->error_mutex);
     qemu_mutex_destroy(&ms->qemu_file_lock);
-    g_free(params->tls_hostname);
-    g_free(params->tls_creds);
     qemu_sem_destroy(&ms->wait_unplug_sem);
     qemu_sem_destroy(&ms->rate_limit_sem);
     qemu_sem_destroy(&ms->pause_sem);
-- 
2.32.0



  parent reply	other threads:[~2022-07-07 19:03 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-07 18:53 [PATCH v9 00/14] migration: Postcopy Preemption Peter Xu
2022-07-07 18:53 ` [PATCH v9 01/14] migration: Add postcopy-preempt capability Peter Xu
2022-07-07 18:55 ` [PATCH v9 02/14] migration: Postcopy preemption preparation on channel creation Peter Xu
2022-07-19 15:15   ` Dr. David Alan Gilbert
2022-07-19 15:25     ` Peter Xu
2022-07-19 15:31       ` Dr. David Alan Gilbert
2022-07-19 15:39         ` Peter Xu
2022-07-19 16:06           ` Dr. David Alan Gilbert
2022-07-07 18:55 ` [PATCH v9 03/14] migration: Postcopy preemption enablement Peter Xu
2022-07-07 18:55 ` [PATCH v9 04/14] migration: Postcopy recover with preempt enabled Peter Xu
2022-07-07 18:55 ` [PATCH v9 05/14] migration: Create the postcopy preempt channel asynchronously Peter Xu
2022-07-07 18:55 ` [PATCH v9 06/14] migration: Add property x-postcopy-preempt-break-huge Peter Xu
2022-07-07 18:55 ` [PATCH v9 07/14] migration: Add helpers to detect TLS capability Peter Xu
2022-07-07 18:55 ` Peter Xu [this message]
2022-07-07 18:55 ` [PATCH v9 09/14] migration: Enable TLS for preempt channel Peter Xu
2022-07-07 18:55 ` [PATCH v9 10/14] migration: Respect postcopy request order in preemption mode Peter Xu
2022-07-07 18:55 ` [PATCH v9 11/14] tests: Move MigrateCommon upper Peter Xu
2022-07-07 18:55 ` [PATCH v9 12/14] tests: Add postcopy tls migration test Peter Xu
2022-07-13 11:25   ` Dr. David Alan Gilbert
2022-07-07 18:55 ` [PATCH v9 13/14] tests: Add postcopy tls recovery " Peter Xu
2022-07-07 18:55 ` [PATCH v9 14/14] tests: Add postcopy preempt tests Peter Xu
2022-07-19 13:50 ` [PATCH v9 00/14] migration: Postcopy Preemption Dr. David Alan Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220707185515.27475-1-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=lsoaresp@redhat.com \
    --cc=manish.mishra@nutanix.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.