From patchwork Wed Feb 24 11:07:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harmandeep Kaur X-Patchwork-Id: 8405171 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1BABCC0553 for ; Wed, 24 Feb 2016 11:10:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29A0F20303 for ; Wed, 24 Feb 2016 11:10:21 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 440BC202E6 for ; Wed, 24 Feb 2016 11:10:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYXIj-0000rn-Sj; Wed, 24 Feb 2016 11:08:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYXIi-0000rV-BV for xen-devel@lists.xenproject.org; Wed, 24 Feb 2016 11:08:12 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id C2/10-02989-B1F8DC65; Wed, 24 Feb 2016 11:08:11 +0000 X-Env-Sender: write.harmandeep@gmail.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1456312086!24638777!1 X-Originating-IP: [209.85.220.66] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13067 invoked from network); 24 Feb 2016 11:08:07 -0000 Received: from mail-pa0-f66.google.com (HELO mail-pa0-f66.google.com) (209.85.220.66) by server-4.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 24 Feb 2016 11:08:07 -0000 Received: by mail-pa0-f66.google.com with SMTP id a7so740701pax.3 for ; Wed, 24 Feb 2016 03:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=hkK68oGsrJAZghMyPsg7iLpxhh9YMCRh5SiN8AT2Blc=; b=yjYOGKSEzdtXVdGgZOSedPhZ0KKF8w9WDyqO2xKWIn5BzHxtn7woiPYpW6cCcYw+pL sIcv1vDLnq5+A+EyXKzDLjj2+oM1AhMWCCBCLPDjS7LJhbnAexm4BhOji3QOoU6IPiiG ZRTclFBNFya91ki2UckFB8ewiuzH6f72ompyEK5v6C0NrM5ryxHzt34Bnx3L9Ems6hI+ TuTBbJK3R6A7+6x9Kr+tJhbTEGZPwrvmZ0Dh1EKDWmIq6swjFJvNJLskfdYjPnK5i+re TNNYl24a8PyCqZDJY78U7uE89nyAaZjXQgPS21x0PWd9C87xiTWpnU8Ux3P7+fl4/ROS XKgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hkK68oGsrJAZghMyPsg7iLpxhh9YMCRh5SiN8AT2Blc=; b=N4Du+AMBnjL1emC2Ewvch/Na6y7ZvKoqPlTT7UcHqelI84V9itFaf6tAtQScjugp0Q MGLi1wbrJT/SPZrvqV8hS880VABBO0EJiVqR9NPxyHBD1kI28/ZdiZWyk9WVft3QSRsU RsdvGLn38LQhJ16HkH8/Stu+MFeEtzp4ZoQoHFlxca87h6BexM8Inun9XBZi/+VtQjFo T/4zW9n+hzgm/kinJ3BIcJKAyb1MVi+k1uMvZ/hvqPtsVjtD2k5pN23pthX4l+xvWV+j pvuB3QYlMyEDFoxqSvB6+LDNjIqjNu6cmLfRfD5IDyKsLpLq/Fp9980bAr/OFuMDiM/0 kOWQ== X-Gm-Message-State: AG10YOTOG1IB5b9gGvbrUjcT71wY7v6PRDBTlSmh6YyYwF4g8V/kOHtUZWnRu84rmEg0Fg== X-Received: by 10.66.228.231 with SMTP id sl7mr19895033pac.30.1456312086193; Wed, 24 Feb 2016 03:08:06 -0800 (PST) Received: from localhost.localdomain ([124.253.62.0]) by smtp.googlemail.com with ESMTPSA id q8sm4226962pfa.70.2016.02.24.03.08.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Feb 2016 03:08:05 -0800 (PST) From: Harmandeep Kaur To: xen-devel@lists.xenproject.org Date: Wed, 24 Feb 2016 16:37:41 +0530 Message-Id: <1456312061-2606-1-git-send-email-write.harmandeep@gmail.com> X-Mailer: git-send-email 2.5.0 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 Subject: [Xen-devel] [PATCH v4] libxl: handle failure of xc_version() in libxl_get_version_info() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 a NULL return value. Coverity ID 1351217 Signed-off-by: Harmandeep Kaur Reviewed-by: Dario Faggioli --- v2: Change local variable rc to r. Removes xen_version. Better readiblity of blocks of code. Group all calls to xc_version() , so that data copies in various info fields only if all calls to xc_version go error-free. v3: Group all calls to xc_version() , so that data copies in various info fields only if all calls to xc_version work. v4: Improve suboptimal subject. Readds xen_version to suit re-arrangement. --- tools/libxl/libxl.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2d18b8d..07f2667 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5268,41 +5268,44 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) 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); + if (xen_version < 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 = xen_version >> 16; info->xen_version_minor = xen_version & 0xFF; - - xc_version(ctx->xch, XENVER_extraversion, &u.xen_extra); 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,