From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harmandeep Kaur Subject: [PATCH v3] libxl: fix handling of returns in libxl_get_version_info() Date: Sat, 13 Feb 2016 02:05:13 +0530 Message-ID: <1455309313-5149-1-git-send-email-write.harmandeep@gmail.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 1aUKRY-0003uq-F5 for xen-devel@lists.xenproject.org; Fri, 12 Feb 2016 20:35:56 +0000 Received: by mail-pa0-f66.google.com with SMTP id fl4so4217204pad.2 for ; Fri, 12 Feb 2016 12:35:54 -0800 (PST) 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@lists.xenproject.org Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Harmandeep Kaur List-Id: xen-devel@lists.xenproject.org Check the return value of xc_version() and return NULL if it fails. libxl_get_version_info() can also return NULL now. Callers of the function libxl_get_version_info() are already prepared to deal with returning NULL on failure of xc_version(). Group all calls to xc_version() , so that data copies in various info fields only if all calls to xc_version go error-free. Coverity ID 1351217 Signed-off-by: Harmandeep Kaur --- v2: Change local variable rc to r. Remove xen_version. Better readiblity of blocks of code. v3: Group all calls to xc_version() , so that data copies in various info fields only if all calls to xc_version work. --- tools/libxl/libxl.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2d18b8d..f660280 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5267,42 +5267,44 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) xen_platform_parameters_t p_parms; xen_commandline_t xen_commandline; } u; - long xen_version; + long r = 0; libxl_version_info *info = &ctx->version_info; if (info->xen_version_extra != NULL) goto out; - xen_version = xc_version(ctx->xch, XENVER_version, NULL); - info->xen_version_major = xen_version >> 16; - info->xen_version_minor = xen_version & 0xFF; - - xc_version(ctx->xch, XENVER_extraversion, &u.xen_extra); + r = xc_version(ctx->xch, XENVER_version, NULL); + if (r < 0) goto out; + r = xc_version(ctx->xch, XENVER_extraversion, &u.xen_extra); + if (r < 0) goto out; + r = xc_version(ctx->xch, XENVER_compile_info, &u.xen_cc); + if (r < 0) goto out; + r = xc_version(ctx->xch, XENVER_capabilities, &u.xen_caps); + if (r < 0) goto out; + r = xc_version(ctx->xch, XENVER_changeset, &u.xen_chgset); + if (r < 0) goto out; + r = xc_version(ctx->xch, XENVER_platform_parameters, &u.p_parms); + if (r < 0) goto out; + r = info->pagesize = xc_version(ctx->xch, XENVER_pagesize, NULL); + if (r < 0) goto out; + r = xc_version(ctx->xch, XENVER_commandline, &u.xen_commandline); + if (r < 0) goto out; + + info->xen_version_major = r >> 16; + info->xen_version_minor = r & 0xFF; info->xen_version_extra = libxl__strdup(NOGC, u.xen_extra); - - xc_version(ctx->xch, XENVER_compile_info, &u.xen_cc); info->compiler = libxl__strdup(NOGC, u.xen_cc.compiler); info->compile_by = libxl__strdup(NOGC, u.xen_cc.compile_by); info->compile_domain = libxl__strdup(NOGC, u.xen_cc.compile_domain); info->compile_date = libxl__strdup(NOGC, u.xen_cc.compile_date); - - xc_version(ctx->xch, XENVER_capabilities, &u.xen_caps); info->capabilities = libxl__strdup(NOGC, u.xen_caps); - - xc_version(ctx->xch, XENVER_changeset, &u.xen_chgset); info->changeset = libxl__strdup(NOGC, u.xen_chgset); - - xc_version(ctx->xch, XENVER_platform_parameters, &u.p_parms); info->virt_start = u.p_parms.virt_start; - - info->pagesize = xc_version(ctx->xch, XENVER_pagesize, NULL); - - xc_version(ctx->xch, XENVER_commandline, &u.xen_commandline); info->commandline = libxl__strdup(NOGC, u.xen_commandline); out: GC_FREE; - return info; + return r < 0 ? NULL:info; } libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, -- 2.5.0