[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failu
From: |
Markus Armbruster |
Subject: |
[PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failure |
Date: |
Fri, 27 Aug 2021 06:50:34 +0200 |
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-6-armbru@redhat.com>
Acked-by: Michael S. Tsirkin <mst@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
- [PULL 00/15] Error reporting patches for 2021-08-26, Markus Armbruster, 2021/08/27
- [PULL 06/15] i386: Never free migration blocker objects instead of sometimes, Markus Armbruster, 2021/08/27
- [PULL 03/15] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly, Markus Armbruster, 2021/08/27
- [PULL 10/15] migration: Handle migration_incoming_setup() errors consistently, Markus Armbruster, 2021/08/27
- [PULL 09/15] migration: Unify failure check for migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 15/15] vl: Clean up -smp error handling, Markus Armbruster, 2021/08/27
- [PULL 02/15] spapr: Plug memory leak when we can't add a migration blocker, Markus Armbruster, 2021/08/27
- [PULL 11/15] microvm: Drop dead error handling in microvm_machine_state_init(), Markus Armbruster, 2021/08/27
- [PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failure,
Markus Armbruster <=
- [PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling, Markus Armbruster, 2021/08/27
- [PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker(), Markus Armbruster, 2021/08/27
- [PULL 14/15] Remove superfluous ERRP_GUARD(), Markus Armbruster, 2021/08/27
- [PULL 13/15] vhost: Clean up how VhostOpts method vhost_backend_init() fails, Markus Armbruster, 2021/08/27
- [PULL 12/15] vhost: Clean up how VhostOpts method vhost_get_config() fails, Markus Armbruster, 2021/08/27
- [PULL 01/15] error: Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2021/08/27
- Re: [PULL 00/15] Error reporting patches for 2021-08-26, Peter Maydell, 2021/08/27