From patchwork Mon Jan 25 21:06:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 8115511 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C496C9F6DA for ; Mon, 25 Jan 2016 21:10:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02A6E201EF for ; Mon, 25 Jan 2016 21:10:03 +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 2789E2017D for ; Mon, 25 Jan 2016 21:10:02 +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 1aNoMB-0000YA-Lo; Mon, 25 Jan 2016 21:07:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aNoMA-0000Xd-O4 for xen-devel@lists.xenproject.org; Mon, 25 Jan 2016 21:07:26 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 3C/EB-31122-E8E86A65; Mon, 25 Jan 2016 21:07:26 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1453756043!12035254!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12713 invoked from network); 25 Jan 2016 21:07:25 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-11.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Jan 2016 21:07:25 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u0PL7Ctl030467 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 25 Jan 2016 21:07:12 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u0PL7A4R030324 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 25 Jan 2016 21:07:10 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u0PL7AeX016923; Mon, 25 Jan 2016 21:07:10 GMT Received: from x230.dumpdata.com.com (/10.154.179.98) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 25 Jan 2016 13:07:09 -0800 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, ian.campbell@citrix.com, wei.liu2@citrix.com, ian.jackson@eu.citrix.com Date: Mon, 25 Jan 2016 16:06:56 -0500 Message-Id: <1453756017-8747-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1453756017-8747-1-git-send-email-konrad.wilk@oracle.com> References: <1453756017-8747-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: Yang Hongyang , Wen Congyang , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH 2/3] libxl/remus: Move the assert before the info is used. 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 The assert(info) is after quite a lot of manipulations on 'info' - which makes the assert pointless because if info was NULL it would have crashed earlier. Move it earlier so that it guards before we try using the 'info' structure. CC: Wen Congyang CC: Yang Hongyang Signed-off-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2bde0f5..60974cc 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -855,6 +855,8 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, goto out; } + assert(info); + libxl_defbool_setdefault(&info->allow_unsafe, false); libxl_defbool_setdefault(&info->blackhole, false); libxl_defbool_setdefault(&info->compression, true); @@ -883,8 +885,6 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, dss->debug = 0; dss->remus = info; - assert(info); - /* Point of no return */ libxl__remus_setup(egc, dss); return AO_INPROGRESS;