From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH v3 07/10] xl: correct handling of extra_config in main_cpupoolcreate
Date: Tue, 14 Jul 2015 17:41:10 +0100 [thread overview]
Message-ID: <1436892073-14186-8-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1436892073-14186-1-git-send-email-wei.liu2@citrix.com>
Don't dereference extra_config if it's NULL. Don't leak extra_config in
the end.
Also fixed a typo in error string while I was there.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/xl_cmdimpl.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 971209c..607db4e 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -7228,9 +7228,9 @@ int main_cpupoolcreate(int argc, char **argv)
else
config_src="command line";
- if (strlen(extra_config)) {
+ if (extra_config && strlen(extra_config)) {
if (config_len > INT_MAX - (strlen(extra_config) + 2)) {
- fprintf(stderr, "Failed to attach extra configration\n");
+ fprintf(stderr, "Failed to attach extra configuration\n");
goto out;
}
config_data = xrealloc(config_data,
@@ -7365,6 +7365,7 @@ out_cfg:
out:
free(name);
free(config_data);
+ free(extra_config);
return rc;
}
--
1.9.1
next prev parent reply other threads:[~2015-07-14 16:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 16:41 [PATCH v3 00/10] xl/libxl: fix issues discovered by coverity Wei Liu
2015-07-14 16:41 ` [PATCH v3 01/10] libxl: don't check s!=NULL in libxl__abs_path Wei Liu
2015-07-14 17:19 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 02/10] libxl: turn two malloc's to libxl__malloc Wei Liu
2015-07-14 17:19 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 03/10] libxl: make libxl__strdup handle NULL Wei Liu
2015-07-14 17:21 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 04/10] libxl: avoid leaking in libxl__initia_device_remove Wei Liu
2015-07-14 17:21 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 05/10] libxl: localtime(3) can return NULL Wei Liu
2015-07-14 17:22 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 06/10] libxl: qmp_init_handler " Wei Liu
2015-07-14 17:23 ` Ian Jackson
2015-07-14 16:41 ` Wei Liu [this message]
2015-07-14 17:23 ` [PATCH v3 07/10] xl: correct handling of extra_config in main_cpupoolcreate Ian Jackson
2015-09-11 10:59 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 08/10] xl: correctly handle null extra config in main_config_update Wei Liu
2015-07-14 17:23 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 09/10] xl: fix a typo in error string in create_domain Wei Liu
2015-07-14 17:24 ` Ian Jackson
2015-07-14 16:41 ` [PATCH v3 10/10] libxl: fix caller of libxl_cpupool functions Wei Liu
2015-07-14 17:33 ` Ian Jackson
2015-07-15 17:16 ` Wei Liu
2015-07-16 8:57 ` Dario Faggioli
2015-07-16 9:07 ` Wei Liu
2015-07-16 9:33 ` Juergen Gross
2015-07-16 9:30 ` Juergen Gross
2015-07-16 12:49 ` Dario Faggioli
2015-07-15 10:23 ` [PATCH v3 00/10] xl/libxl: fix issues discovered by coverity Ian Campbell
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=1436892073-14186-8-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xenproject.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).