From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S . Tsirkin" <mst@redhat.com>
Subject: [PATCH 05/16] vhost-scsi: Plug memory leak on migrate_add_blocker() failure
Date: Tue, 20 Jul 2021 14:53:57 +0200 [thread overview]
Message-ID: <20210720125408.387910-6-armbru@redhat.com> (raw)
In-Reply-To: <20210720125408.387910-1-armbru@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/scsi/vhost-scsi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 8c611bfd2d..039caf2614 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -208,7 +208,6 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
"target SCSI device state or use shared storage over network), "
"set 'migratable' property to true to enable migration.");
if (migrate_add_blocker(vsc->migration_blocker, errp) < 0) {
- error_free(vsc->migration_blocker);
goto free_virtio;
}
}
@@ -233,11 +232,12 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
return;
free_vqs:
+ g_free(vsc->dev.vqs);
if (!vsc->migratable) {
migrate_del_blocker(vsc->migration_blocker);
}
- g_free(vsc->dev.vqs);
free_virtio:
+ error_free(vsc->migration_blocker);
virtio_scsi_common_unrealize(dev);
close_fd:
close(vhostfd);
--
2.31.1
next prev parent reply other threads:[~2021-07-20 12:58 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 12:53 [PATCH 00/16] Various error handling fixes and cleanups Markus Armbruster
2021-07-20 12:53 ` [PATCH 01/16] error: Use error_fatal to simplify obvious fatal errors (again) Markus Armbruster
2021-07-20 13:42 ` Eric Blake
2021-07-20 17:55 ` Peter Xu
2021-08-02 19:02 ` Philippe Mathieu-Daudé
2021-08-03 5:44 ` Markus Armbruster
2021-07-20 12:53 ` [PATCH 02/16] spapr: Plug memory leak when we can't add a migration blocker Markus Armbruster
2021-07-20 13:12 ` David Gibson
2021-08-02 18:54 ` Philippe Mathieu-Daudé
2021-07-20 12:53 ` [PATCH 03/16] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly Markus Armbruster
2021-07-21 6:08 ` David Gibson
2021-07-20 12:53 ` [PATCH 04/16] multi-process: Fix pci_proxy_dev_realize() error handling Markus Armbruster
2021-07-20 18:02 ` Philippe Mathieu-Daudé
2021-07-20 20:02 ` Jag Raman
2021-07-20 12:53 ` Markus Armbruster [this message]
2021-07-20 12:53 ` [PATCH 06/16] i386: Never free migration blocker objects instead of sometimes Markus Armbruster
2021-07-20 12:53 ` [PATCH 07/16] vfio: Avoid error_propagate() after migrate_add_blocker() Markus Armbruster
2021-07-20 18:03 ` Philippe Mathieu-Daudé
2021-07-21 6:24 ` Kirti Wankhede
2021-07-21 9:26 ` Paolo Bonzini
2021-07-21 14:12 ` Markus Armbruster
2021-07-20 12:54 ` [PATCH 08/16] whpx nvmm: Drop useless migrate_del_blocker() Markus Armbruster
2021-07-22 8:04 ` Reinoud Zandijk
2021-07-20 12:54 ` [PATCH 09/16] migration: Unify failure check for migrate_add_blocker() Markus Armbruster
2021-07-20 18:05 ` Philippe Mathieu-Daudé
2021-07-20 12:54 ` [PATCH 10/16] migration: Handle migration_incoming_setup() errors consistently Markus Armbruster
2021-07-20 18:53 ` Eric Blake
2021-07-21 14:12 ` Markus Armbruster
2021-07-20 21:55 ` Pankaj Gupta
2021-08-02 17:53 ` Dr. David Alan Gilbert
2021-08-03 5:58 ` Markus Armbruster
2021-08-31 12:47 ` Markus Armbruster
2021-07-20 12:54 ` [PATCH 11/16] microvm: Drop dead error handling in microvm_machine_state_init() Markus Armbruster
2021-07-20 13:36 ` Sergio Lopez
2021-07-20 18:06 ` Philippe Mathieu-Daudé
2021-07-20 21:59 ` Pankaj Gupta
2021-07-20 12:54 ` [PATCH 12/16] vhost: Clean up how VhostOpts method vhost_get_config() fails Markus Armbruster
2021-08-02 18:56 ` Philippe Mathieu-Daudé
2021-08-02 18:58 ` Philippe Mathieu-Daudé
2021-08-03 5:48 ` Markus Armbruster
2021-07-20 12:54 ` [PATCH 13/16] vhost: Clean up how VhostOpts method vhost_backend_init() fails Markus Armbruster
2021-08-02 18:59 ` Philippe Mathieu-Daudé
2021-07-20 12:54 ` [PATCH 14/16] Remove superfluous ERRP_GUARD() Markus Armbruster
2021-08-02 19:00 ` Philippe Mathieu-Daudé
2021-07-20 12:54 ` [PATCH 15/16] vl: Clean up -smp error handling Markus Armbruster
2021-07-20 18:07 ` Philippe Mathieu-Daudé
2021-07-20 12:54 ` [PATCH 16/16] vl: Don't continue after -smp help Markus Armbruster
2021-07-20 18:08 ` [PATCH-for-6.1? " Philippe Mathieu-Daudé
2021-07-20 21:57 ` [PATCH " Pankaj Gupta
2021-07-24 0:30 ` [PATCH 00/16] Various error handling fixes and cleanups Michael S. Tsirkin
2021-07-29 13:23 ` Markus Armbruster
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=20210720125408.387910-6-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=mst@redhat.com \
--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).