xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 03:59:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vhost-scsi: Plug memory leak on migrate_add_blocker() failure

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2021-07-20 14:53:57 +02:00
parent 96ac971933
commit aa6f7448eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/scsi/vhost-scsi.c
View File

@ -208,7 +208,6 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
"target SCSI device state or use shared storage over network), " "target SCSI device state or use shared storage over network), "
"set 'migratable' property to true to enable migration."); "set 'migratable' property to true to enable migration.");
if (migrate_add_blocker(vsc->migration_blocker, errp) < 0) { if (migrate_add_blocker(vsc->migration_blocker, errp) < 0) {
error_free(vsc->migration_blocker);
goto free_virtio; goto free_virtio;
} }
} }
@ -233,11 +232,12 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
return; return;
free_vqs: free_vqs:
g_free(vsc->dev.vqs);
if (!vsc->migratable) { if (!vsc->migratable) {
migrate_del_blocker(vsc->migration_blocker); migrate_del_blocker(vsc->migration_blocker);
} }
g_free(vsc->dev.vqs);
free_virtio: free_virtio:
error_free(vsc->migration_blocker);
virtio_scsi_common_unrealize(dev); virtio_scsi_common_unrealize(dev);
close_fd: close_fd:
close(vhostfd); close(vhostfd);