[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/16] scsi: fix memory leak
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 01/16] scsi: fix memory leak |
Date: |
Thu, 19 Apr 2012 16:29:21 +0200 |
scsibus_get_dev_path is leaking id if it is not NULL. Fix it.
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-bus.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 8e76c5d..d847396 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1430,15 +1430,18 @@ static char *scsibus_get_dev_path(DeviceState *dev)
SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev);
DeviceState *hba = dev->parent_bus->parent;
char *id = NULL;
+ char *path;
if (hba && hba->parent_bus && hba->parent_bus->info->get_dev_path) {
id = hba->parent_bus->info->get_dev_path(hba);
}
if (id) {
- return g_strdup_printf("%s/%d:%d:%d", id, d->channel, d->id, d->lun);
+ path = g_strdup_printf("%s/%d:%d:%d", id, d->channel, d->id, d->lun);
} else {
- return g_strdup_printf("%d:%d:%d", d->channel, d->id, d->lun);
+ path = g_strdup_printf("%d:%d:%d", d->channel, d->id, d->lun);
}
+ g_free(id);
+ return path;
}
static char *scsibus_get_fw_dev_path(DeviceState *dev)
--
1.7.9.3
- [Qemu-devel] [PULL 00/16] Pending SCSI patches for 1.1, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 01/16] scsi: fix memory leak,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 03/16] virtio: add virtio_queue_get_id, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 05/16] scsi: add missing test for cancelled request, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 02/16] virtio-scsi: prepare migration format for multiqueue, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 04/16] virtio-scsi: add multiqueue capability, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 06/16] scsi: make code more homogeneous in AIO callback functions, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 10/16] scsi: add a started field to SCSIDiskReq, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 07/16] scsi: move scsi_flush_complete around, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 11/16] scsi: support FUA on reads, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 08/16] scsi: add support for FUA on writes, Paolo Bonzini, 2012/04/19
- [Qemu-devel] [PATCH 09/16] scsi: force unit access on VERIFY, Paolo Bonzini, 2012/04/19