From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGR2t-0007iI-4P for qemu-devel@nongnu.org; Fri, 15 Mar 2013 05:35:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGR2q-0002T0-PX for qemu-devel@nongnu.org; Fri, 15 Mar 2013 05:35:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGR2q-0002Sp-IR for qemu-devel@nongnu.org; Fri, 15 Mar 2013 05:35:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2F9ZOt7003932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Mar 2013 05:35:24 -0400 From: Kevin Wolf Date: Fri, 15 Mar 2013 10:35:06 +0100 Message-Id: <1363340108-28042-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1363340108-28042-1-git-send-email-kwolf@redhat.com> References: <1363340108-28042-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/8] blockdev: Keep a copy of DriveInfo.serial List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com 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 --- 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