From patchwork Tue Feb 23 10:32:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8390281 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 07E109F52D for ; Tue, 23 Feb 2016 10:35:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 436CB20361 for ; Tue, 23 Feb 2016 10:35:26 +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 68BE5202E5 for ; Tue, 23 Feb 2016 10:35:25 +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 1aYAHE-0005UH-Go; Tue, 23 Feb 2016 10:33:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYAHD-0005Ta-12 for xen-devel@lists.xen.org; Tue, 23 Feb 2016 10:33:07 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A7/0C-10006-2653CC65; Tue, 23 Feb 2016 10:33:06 +0000 X-Env-Sender: prvs=8546ee871=Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1456223583!26000823!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65194 invoked from network); 23 Feb 2016 10:33:05 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 23 Feb 2016 10:33:05 -0000 X-IronPort-AV: E=Sophos;i="5.22,488,1449532800"; d="scan'208";a="340175269" From: Ian Campbell To: , , Date: Tue, 23 Feb 2016 10:32:54 +0000 Message-ID: <1456223574-1594-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456223574-1594-1-git-send-email-ian.campbell@citrix.com> References: <1456223574-1594-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH v2 2/2] xl: free config_data on error in domain_create 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: , 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 CID: 1055898 Signed-off-by: Ian Campbell --- v2: Move spurious looking NULL assignment to previous patch where it belongs. --- tools/libxl/xl_cmdimpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9f08f64..514f5a8 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2795,6 +2795,7 @@ static uint32_t create_domain(struct domain_create *dom_info) if (!restoring && extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configuration\n"); + free(config_data); return ERROR_FAIL; } /* allocate space for the extra config plus two EOLs plus \0 */