From patchwork Tue Feb 16 11:49:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8324411 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 90012C02AA for ; Tue, 16 Feb 2016 11:52:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8ABAA20295 for ; Tue, 16 Feb 2016 11:52:42 +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 9E1D22027D for ; Tue, 16 Feb 2016 11:52:41 +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 1aVe8l-0005zq-7C; Tue, 16 Feb 2016 11:49:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aVe8j-0005zl-TS for xen-devel@lists.xen.org; Tue, 16 Feb 2016 11:49:58 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 66/29-25435-5EC03C65; Tue, 16 Feb 2016 11:49:57 +0000 X-Env-Sender: prvs=847c1d30f=Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1455623395!24220805!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19668 invoked from network); 16 Feb 2016 11:49:56 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 16 Feb 2016 11:49:56 -0000 X-IronPort-AV: E=Sophos;i="5.22,455,1449532800"; d="scan'208";a="331899664" From: Ian Campbell To: , , Date: Tue, 16 Feb 2016 11:49:53 +0000 Message-ID: <1455623393-17364-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH] libxl: close fd's in parent when spawning qdisk 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 Coverity points out that these remain open in the parent upon success, which is a resource leak. To fix this rejig the exit paths such that success and error cases both close the two fds, this means adjusting the callback to only happen for the error case and it also makes sense to rename the label from "error" to just "out". Compile tested only. CID: 1130518 (null) and 1130517 (logfile_w). Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl_dm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index a088d71..4aca38e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1999,12 +1999,12 @@ void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss) logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qdisk-%u", domid)); if (logfile_w < 0) { rc = logfile_w; - goto error; + goto out; } null = open("/dev/null", O_RDONLY); if (null < 0) { rc = ERROR_FAIL; - goto error; + goto out; } dmss->guest_config = NULL; @@ -2030,19 +2030,18 @@ void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss) dmss->spawn.detached_cb = device_model_detached; rc = libxl__spawn_spawn(egc, &dmss->spawn); if (rc < 0) - goto error; + goto out; if (!rc) { /* inner child */ setsid(); libxl__exec(gc, null, logfile_w, logfile_w, dm, args, NULL); } - return; - -error: - assert(rc); + rc = 0; +out: if (logfile_w >= 0) close(logfile_w); if (null >= 0) close(null); - dmss->callback(egc, dmss, rc); + /* callback on error only, success goes via dmss->spawn.*_cb */ + if (rc) dmss->callback(egc, dmss, rc); return; }