From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v3 10/10] libxl: fix caller of libxl_cpupool functions Date: Tue, 14 Jul 2015 17:41:13 +0100 Message-ID: <1436892073-14186-11-git-send-email-wei.liu2@citrix.com> References: <1436892073-14186-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZF3L1-0004BZ-71 for xen-devel@lists.xenproject.org; Tue, 14 Jul 2015 16:45:47 +0000 In-Reply-To: <1436892073-14186-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Coverity complains cpupool_info leaks a string in failure path. Instead of fixing that path, we rely on the callers (two public APIs at the moment) of cpupool_info correctly call libxl_cpupoolinfo_dispose in their failure path to dispose of any resources. That involves: 1. Call _init and _dispose in libxl_list_cpupool 2. Call _init in numa_place_domain Fix numa_place_domain to use goto style to make things more clearer. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli --- tools/libxl/libxl.c | 6 +++++- tools/libxl/libxl_dom.c | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 38aff8d..02b4a26 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -771,8 +771,11 @@ libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out) poolid = 0; for (i = 0;; i++) { - if (cpupool_info(gc, &info, poolid, false)) + libxl_cpupoolinfo_init(&info); + if (cpupool_info(gc, &info, poolid, false)) { + libxl_cpupoolinfo_dispose(&info); break; + } tmp = realloc(ptr, (i + 1) * sizeof(libxl_cpupoolinfo)); if (!tmp) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpupool info"); @@ -783,6 +786,7 @@ libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out) ptr = tmp; ptr[i] = info; poolid = info.poolid + 1; + /* Don't dispose of info. It needs to be returned to caller. */ } *nb_pool_out = i; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 8642192..26e7c67 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -142,6 +142,7 @@ static int numa_place_domain(libxl__gc *gc, uint32_t domid, libxl__numa_candidate_init(&candidate); libxl_bitmap_init(&cpupool_nodemap); + libxl_cpupoolinfo_init(&cpupool_info); /* * Extract the cpumap from the cpupool the domain belong to. In fact, @@ -150,10 +151,10 @@ static int numa_place_domain(libxl__gc *gc, uint32_t domid, */ rc = cpupool = libxl__domain_cpupool(gc, domid); if (rc < 0) - return rc; + goto out; rc = libxl_cpupool_info(CTX, &cpupool_info, cpupool); if (rc) - return rc; + goto out; rc = libxl_domain_need_memory(CTX, info, &memkb); if (rc) -- 1.9.1