[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/27] qdev: Don't leak string property value on hot
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 15/27] qdev: Don't leak string property value on hot unplug |
Date: |
Fri, 4 Jun 2010 18:33:03 +0200 |
From: Markus Armbruster <address@hidden>
parse_string() qemu_strdup()s the property value. It is never freed.
It needs to be freed along with the device. Otherwise, the value of
scsi-disk property "ver" gets leaked when hot-unplugging the disk, for
instance.
Call new PropertyInfo method free() from qdev_free(). Implement it
for qdev_prop_string.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/qdev-properties.c | 6 ++++++
hw/qdev.c | 6 ++++++
hw/qdev.h | 1 +
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index b6ee50f..48a6b45 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -260,6 +260,11 @@ static int parse_string(DeviceState *dev, Property *prop,
const char *str)
return 0;
}
+static void free_string(DeviceState *dev, Property *prop)
+{
+ qemu_free(*(char **)qdev_get_prop_ptr(dev, prop));
+}
+
static int print_string(DeviceState *dev, Property *prop, char *dest, size_t
len)
{
char **ptr = qdev_get_prop_ptr(dev, prop);
@@ -274,6 +279,7 @@ PropertyInfo qdev_prop_string = {
.size = sizeof(char*),
.parse = parse_string,
.print = print_string,
+ .free = free_string,
};
/* --- drive --- */
diff --git a/hw/qdev.c b/hw/qdev.c
index aa2ce01..29f6e9f 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -334,6 +334,7 @@ void qdev_init_nofail(DeviceState *dev)
void qdev_free(DeviceState *dev)
{
BusState *bus;
+ Property *prop;
if (dev->state == DEV_STATE_INITIALIZED) {
while (dev->num_child_bus) {
@@ -349,6 +350,11 @@ void qdev_free(DeviceState *dev)
}
qemu_unregister_reset(qdev_reset, dev);
QLIST_REMOVE(dev, sibling);
+ for (prop = dev->info->props; prop && prop->name; prop++) {
+ if (prop->info->free) {
+ prop->info->free(dev, prop);
+ }
+ }
qemu_free(dev);
}
diff --git a/hw/qdev.h b/hw/qdev.h
index 7c25a94..51a24e2 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -98,6 +98,7 @@ struct PropertyInfo {
enum PropertyType type;
int (*parse)(DeviceState *dev, Property *prop, const char *str);
int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);
+ void (*free)(DeviceState *dev, Property *prop);
};
typedef struct GlobalProperty {
--
1.6.6.1
- [Qemu-devel] [PULL 00/27] Block patches, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 15/27] qdev: Don't leak string property value on hot unplug,
Kevin Wolf <=
- [Qemu-devel] [PATCH 16/27] ide: Turn drive serial into a qdev property ide-drive.serial, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 06/27] blockdev: Belatedly remove MAX_DRIVES, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 07/27] blockdev: Belatedly remove driveopts, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 01/27] Cleanup: bdrv_open() no need to shift total_size just to shift back., Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 11/27] ide: Split ide_init1() off ide_init2(), Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 02/27] Cleanup: Be consistent and use BDRV_SECTOR_SIZE instead of 512, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 04/27] Cleanup: virtio-blk.c: Be more consistent using BDRV_SECTOR_SIZE instead, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 05/27] qemu-io: Fix error messages, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 08/27] usb: Remove unused usb_device_add() parameter is_hotplug, Kevin Wolf, 2010/06/04
- [Qemu-devel] [PATCH 14/27] qdev: New qdev_prop_set_string(), Kevin Wolf, 2010/06/04