[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/8] blockdev: Keep a copy of DriveInfo.serial
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 6/8] blockdev: Keep a copy of DriveInfo.serial |
Date: |
Fri, 15 Mar 2013 10:35:06 +0100 |
Pointing to a QemuOpts element is surprising and can lead to subtle
use-after-free errors when the QemuOpts is freed after all options are
parsed.
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 5 ++++-
include/sysemu/blockdev.h | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index d679174..acf1c32 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -191,6 +191,7 @@ static void drive_uninit(DriveInfo *dinfo)
bdrv_delete(dinfo->bdrv);
g_free(dinfo->id);
QTAILQ_REMOVE(&drives, dinfo, next);
+ g_free(dinfo->serial);
g_free(dinfo);
}
@@ -566,7 +567,9 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType
block_default_type)
dinfo->trans = translation;
dinfo->opts = opts;
dinfo->refcount = 1;
- dinfo->serial = serial;
+ if (serial != NULL) {
+ dinfo->serial = g_strdup(serial);
+ }
QTAILQ_INSERT_TAIL(&drives, dinfo, next);
bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index 1fe5332..804ec88 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -40,7 +40,7 @@ struct DriveInfo {
int media_cd;
int cyls, heads, secs, trans;
QemuOpts *opts;
- const char *serial;
+ char *serial;
QTAILQ_ENTRY(DriveInfo) next;
int refcount;
};
--
1.8.1.4
- [Qemu-devel] [PATCH v2 0/8] block: Add driver specific options, Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 3/8] Add qdict_clone_shallow(), Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 1/8] block: Add options QDict to .bdrv_open(), Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 5/8] qemu-option: Add qemu_opts_absorb_qdict(), Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 4/8] block: Add options QDict to bdrv_open_common(), Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 6/8] blockdev: Keep a copy of DriveInfo.serial,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 2/8] block: Add options QDict to bdrv_open() prototype, Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 8/8] qcow2: Allow lazy refcounts to be enabled on the command line, Kevin Wolf, 2013/03/15
- [Qemu-devel] [PATCH v2 7/8] block: Support driver specific options in drive_init(), Kevin Wolf, 2013/03/15
- Re: [Qemu-devel] [PATCH v2 0/8] block: Add driver specific options, Stefan Hajnoczi, 2013/03/15