qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: peterx@redhat.com
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Fabiano Rosas <farosas@suse.de>,
	peterx@redhat.com, Markus Armbruster <armbru@redhat.com>
Subject: [PULL 02/14] migration: Plug memory leak on HMP migrate error path
Date: Mon, 29 Jan 2024 11:03:53 +0800	[thread overview]
Message-ID: <20240129030405.177100-3-peterx@redhat.com> (raw)
In-Reply-To: <20240129030405.177100-1-peterx@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

hmp_migrate() leaks @caps when qmp_migrate() fails.  Plug the leak
with g_autoptr().

Fixes: 967f2de5c9ec (migration: Implement MigrateChannelList to hmp migration flow.) v8.2.0-rc0
Fixes: CID 1533125
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Link: https://lore.kernel.org/r/20240117140722.3979657-1-armbru@redhat.com
[peterx: fix CID number as reported by Peter Maydell]
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/migration-hmp-cmds.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 740a219aa4..99b49df5dd 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -764,7 +764,7 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
     bool resume = qdict_get_try_bool(qdict, "resume", false);
     const char *uri = qdict_get_str(qdict, "uri");
     Error *err = NULL;
-    MigrationChannelList *caps = NULL;
+    g_autoptr(MigrationChannelList) caps = NULL;
     g_autoptr(MigrationChannel) channel = NULL;
 
     if (inc) {
@@ -789,8 +789,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
         return;
     }
 
-    qapi_free_MigrationChannelList(caps);
-
     if (!detach) {
         HMPMigrationStatus *status;
 
-- 
2.43.0



  parent reply	other threads:[~2024-01-29  3:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-29  3:03 [PULL 00/14] Migration 20240126 patches peterx
2024-01-29  3:03 ` [PULL 01/14] userfaultfd: use 1ULL to build ioctl masks peterx
2024-01-29  3:03 ` peterx [this message]
2024-01-29  3:03 ` [PULL 03/14] migration: Make threshold_size an uint64_t peterx
2024-01-29  3:03 ` [PULL 04/14] migration: Drop unnecessary check in ram's pending_exact() peterx
2024-01-29  3:03 ` [PULL 05/14] analyze-migration.py: Remove trick on parsing ramblocks peterx
2024-01-29  3:03 ` [PULL 06/14] ci: Add a migration compatibility test job peterx
2024-02-02 13:22   ` Peter Maydell
2024-02-02 13:47     ` Fabiano Rosas
2024-02-05  3:25       ` Peter Xu
2024-02-05 10:22         ` Daniel P. Berrangé
2024-02-05 10:45           ` Peter Xu
2024-02-05 10:49             ` Daniel P. Berrangé
2024-01-29  3:03 ` [PULL 07/14] ci: Disable migration compatibility tests for aarch64 peterx
2024-01-29  3:03 ` [PULL 08/14] migration/yank: Use channel features peterx
2024-01-29  3:04 ` [PULL 09/14] migration: Fix use-after-free of migration state object peterx
2024-01-29  3:04 ` [PULL 10/14] migration: Take reference to migration state around bg_migration_vm_start_bh peterx
2024-01-29  3:04 ` [PULL 11/14] migration: Reference migration state around loadvm_postcopy_handle_run_bh peterx
2024-01-29  3:04 ` [PULL 12/14] migration: Add a wrapper to qemu_bh_schedule peterx
2024-01-29  3:04 ` [PULL 13/14] migration: Centralize BH creation and dispatch peterx
2024-01-29  3:04 ` [PULL 14/14] Make 'uri' optional for migrate QAPI peterx
2024-01-29 17:22 ` [PULL 00/14] Migration 20240126 patches Peter Maydell

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=20240129030405.177100-3-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=armbru@redhat.com \
    --cc=farosas@suse.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).