From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>
Subject: [PATCH 1/4] tools/xenstore: Fix 15 potential resource leaks in build()
Date: Mon, 25 Nov 2013 11:07:41 +0000 [thread overview]
Message-ID: <1385377664-20979-2-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1385377664-20979-1-git-send-email-andrew.cooper3@citrix.com>
Coverity ID: 1055933 1055934
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
tools/xenstore/init-xenstore-domain.c | 45 ++++++++++++++++++++-------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c
index 35f1aa3..56a3c72 100644
--- a/tools/xenstore/init-xenstore-domain.c
+++ b/tools/xenstore/init-xenstore-domain.c
@@ -18,51 +18,60 @@ static int build(xc_interface *xch, char** argv)
char cmdline[512];
uint32_t ssid;
xen_domain_handle_t handle = { 0 };
- int rv;
- int xs_fd = open("/dev/xen/xenbus_backend", O_RDWR);
- struct xc_dom_image *dom;
+ int rv, xs_fd;
+ struct xc_dom_image *dom = NULL;
int maxmem = atoi(argv[2]);
int limit_kb = (maxmem + 1)*1024;
+ xs_fd = open("/dev/xen/xenbus_backend", O_RDWR);
+ if (xs_fd == -1) return -1;
+
rv = xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_domain_create(xch, ssid, handle, 0, &domid);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_domain_max_vcpus(xch, domid, 1);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_domain_setmaxmem(xch, domid, limit_kb);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_domain_set_memmap_limit(xch, domid, limit_kb);
- if (rv) return rv;
+ if (rv) goto err;
rv = ioctl(xs_fd, IOCTL_XENBUS_BACKEND_SETUP, domid);
- if (rv < 0) return rv;
+ if (rv < 0) goto err;
snprintf(cmdline, 512, "--event %d --internal-db", rv);
dom = xc_dom_allocate(xch, cmdline, NULL);
rv = xc_dom_kernel_file(dom, argv[1]);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_dom_boot_xen_init(dom, xch, domid);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_dom_parse_image(dom);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_dom_mem_init(dom, maxmem);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_dom_boot_mem_init(dom);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_dom_build_image(dom);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_dom_boot_image(dom);
- if (rv) return rv;
+ if (rv) goto err;
xc_dom_release(dom);
+ dom = NULL;
rv = xc_domain_set_virq_handler(xch, domid, VIRQ_DOM_EXC);
- if (rv) return rv;
+ if (rv) goto err;
rv = xc_domain_unpause(xch, domid);
- if (rv) return rv;
+ if (rv) goto err;
return 0;
+
+err:
+ if (dom)
+ xc_dom_release(dom);
+ close(xs_fd);
+ return rv;
}
int main(int argc, char** argv)
--
1.7.10.4
next prev parent reply other threads:[~2013-11-25 11:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-25 11:07 [PATCH 0/4] Coverity fixes for tools/xenstore Andrew Cooper
2013-11-25 11:07 ` Andrew Cooper [this message]
2013-11-25 12:23 ` [PATCH 1/4] tools/xenstore: Fix 15 potential resource leaks in build() Ian Jackson
2013-11-25 11:07 ` [PATCH 2/4] tools/xenstore-rm: Fix memory leaks Andrew Cooper
2013-11-25 12:24 ` Ian Jackson
2013-11-25 11:07 ` [PATCH 3/4] tools/xenstored: Avoid buffer overflows while setting up sockets Andrew Cooper
2013-11-25 12:25 ` Matthew Daley
2013-11-25 14:38 ` [Patch v2 " Andrew Cooper
2013-12-02 13:18 ` Andrew Cooper
2013-12-09 13:32 ` Andrew Cooper
2013-12-13 18:13 ` Andrew Cooper
2013-12-13 18:28 ` [Patch v2 3/4] tools/xenstored: Avoid buffer overflows while setting up sockets [and 1 more messages] Ian Jackson
2013-12-13 19:15 ` Andrew Cooper
2013-11-25 12:27 ` [PATCH 3/4] tools/xenstored: Avoid buffer overflows while setting up sockets Ian Jackson
2013-11-25 11:07 ` [PATCH 4/4] tools/xenstored: Don't leak a file handle when creating the pidfile Andrew Cooper
2013-11-25 12:29 ` Ian Jackson
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=1385377664-20979-2-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.