From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xen.org
Cc: Juergen Gross <jgross@suse.com>,
wei.liu2@citrix.com, ian.jackson@eu.citrix.com
Subject: [PATCH] libxl: fix double free when doing xl save
Date: Thu, 28 Jul 2016 09:21:43 +0200 [thread overview]
Message-ID: <1469690503-849-1-git-send-email-jgross@suse.com> (raw)
Commit d2412fd63b14c6c21d0a3d4367afa448425dfb8a ("libxl: move common
nic stuff into one source") introduced a double free error in libxl
which occurred during "xl save".
Correct this error.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
tools/libxl/libxl.c | 2 +-
tools/libxl/libxl_nic.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 278285a..760ebca 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -3228,7 +3228,7 @@ static int libxl__device_channel_from_xenstore(libxl__gc *gc,
GCSPRINTF("%s/name", libxl_path),
(const char **)(&channel->name));
if (rc) goto out;
- rc = libxl__xs_read_checked(NOGC, XBT_NULL,
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
GCSPRINTF("%s/connection", libxl_path), &tmp);
if (rc) goto out;
if (!strcmp(tmp, "pty")) {
diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c
index ff1834f..c34b7ba 100644
--- a/tools/libxl/libxl_nic.c
+++ b/tools/libxl/libxl_nic.c
@@ -321,19 +321,19 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc,
memset(nic->mac, 0, sizeof(nic->mac));
}
- rc = libxl__xs_read_checked(gc, XBT_NULL,
+ rc = libxl__xs_read_checked(NOGC, XBT_NULL,
GCSPRINTF("%s/ip", libxl_path),
(const char **)(&nic->ip));
if (rc) goto out;
- rc = libxl__xs_read_checked(gc, XBT_NULL,
+ rc = libxl__xs_read_checked(NOGC, XBT_NULL,
GCSPRINTF("%s/bridge", libxl_path),
(const char **)(&nic->bridge));
if (rc) goto out;
- rc = libxl__xs_read_checked(gc, XBT_NULL,
+ rc = libxl__xs_read_checked(NOGC, XBT_NULL,
GCSPRINTF("%s/script", libxl_path),
(const char **)(&nic->script));
if (rc) goto out;
- rc = libxl__xs_read_checked(gc, XBT_NULL,
+ rc = libxl__xs_read_checked(NOGC, XBT_NULL,
GCSPRINTF("%s/forwarddev", libxl_path),
(const char **)(&nic->coloft_forwarddev));
if (rc) goto out;
--
2.6.6
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next reply other threads:[~2016-07-28 7:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 7:21 Juergen Gross [this message]
2016-07-28 9:36 ` [PATCH] libxl: fix double free when doing xl save Wei Liu
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=1469690503-849-1-git-send-email-jgross@suse.com \
--to=jgross@suse.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/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).