From: Alexander Graf <agraf@suse.de>
To: "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>
Cc: "xen-devel@lists.xensource.com Devel"
<xen-devel@lists.xensource.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [Qemu-devel] [PATCH 05/12] xen_console: fix memory leak
Date: Tue, 5 Jul 2011 18:51:06 +0200 [thread overview]
Message-ID: <1309884673-18965-6-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1309884673-18965-1-git-send-email-agraf@suse.de>
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
con_init leaks the string "type", fix it.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
hw/xen_console.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/xen_console.c b/hw/xen_console.c
index c6c8163..2d613ee 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -180,6 +180,7 @@ static int con_init(struct XenDevice *xendev)
{
struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
char *type, *dom;
+ int ret = 0;
/* setup */
dom = xs_get_domain_path(xenstore, con->xendev.dom);
@@ -189,7 +190,8 @@ static int con_init(struct XenDevice *xendev)
type = xenstore_read_str(con->console, "type");
if (!type || strcmp(type, "ioemu") != 0) {
xen_be_printf(xendev, 1, "not for me (type=%s)\n", type);
- return -1;
+ ret = -1;
+ goto out;
}
if (!serial_hds[con->xendev.dev])
@@ -198,7 +200,9 @@ static int con_init(struct XenDevice *xendev)
else
con->chr = serial_hds[con->xendev.dev];
- return 0;
+out:
+ qemu_free(type);
+ return ret;
}
static int con_connect(struct XenDevice *xendev)
--
1.6.0.2
next prev parent reply other threads:[~2011-07-05 16:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 16:51 [Qemu-devel] [PULL 00/12] Xen patch queue 2011-07-05 Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 01/12] xen: Clean up build system Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 02/12] xen: Clean up map cache API naming Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 03/12] xen: Fold CONFIG_XEN_MAPCACHE into CONFIG_XEN Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 04/12] xen: enable console and disk backend in HVM mode Alexander Graf
2011-07-05 16:51 ` Alexander Graf [this message]
2011-07-05 16:51 ` [Qemu-devel] [PATCH 06/12] xen: add vkbd support for PV on HVM guests Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 07/12] xen_disk: cope with missing xenstore "params" node Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 08/12] qemu_ram_ptr_length: take ram_addr_t as arguments Alexander Graf
2011-07-06 13:12 ` Vasily Khoruzhick
2011-07-05 16:51 ` [Qemu-devel] [PATCH 09/12] xen_disk: treat "aio" as "raw" Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 10/12] checkpatch: don't error out on }, { lines Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 11/12] xen_console: support the new extended xenstore protocol Alexander Graf
2011-07-05 16:51 ` [Qemu-devel] [PATCH 12/12] xen_console: fall back to qemu serial device Alexander Graf
2011-07-19 15:59 ` [Qemu-devel] [PULL 00/12] Xen patch queue 2011-07-05 Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309884673-18965-6-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).