From patchwork Mon Mar 23 18:33:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 11453709 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 656A314B4 for ; Mon, 23 Mar 2020 18:33:30 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42FE02072D for ; Mon, 23 Mar 2020 18:33:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 42FE02072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 61B3310FC3798; Mon, 23 Mar 2020 11:34:20 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=vishal.l.verma@intel.com; receiver= Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 297A710FC3795 for ; Mon, 23 Mar 2020 11:34:17 -0700 (PDT) IronPort-SDR: 5e8qogPGXFZ2Exo5oOVGtdDvAnIN5idSmlqkvCzyeYARWAHUA//rnsQSeJ7M29olO3AX3W8BzF C5bxDP+2ftpw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2020 11:33:27 -0700 IronPort-SDR: B03f1vwCdxCHL3w4Yhekp9Z1aQnzlD41FgcEt06hKL3fts6nMv9Cr6uhYoUvbrWYG9I6n1RPcp RvzdasFQno8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,297,1580803200"; d="scan'208";a="419597505" Received: from vverma7-desk1.amr.corp.intel.com (HELO vverma7-desk1.lm.intel.com) ([10.232.112.164]) by orsmga005.jf.intel.com with ESMTP; 23 Mar 2020 11:33:26 -0700 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH] ndctl/namespace: Fix a resource leak in file_write_infoblock Date: Mon, 23 Mar 2020 12:33:21 -0600 Message-Id: <20200323183321.21889-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.1 MIME-Version: 1.0 Message-ID-Hash: 4Q6SYEWNSW5PEIMYE3PMECONWI7LHFDW X-Message-ID-Hash: 4Q6SYEWNSW5PEIMYE3PMECONWI7LHFDW X-MailFrom: vishal.l.verma@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Static analysis reported that we were leaking 'fd' in one case in the above function, fix the error handling to go through the 'out' label. Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- ndctl/namespace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ndctl/namespace.c b/ndctl/namespace.c index 21252b6..0550580 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -1958,8 +1958,10 @@ static int file_write_infoblock(const char *path) } buf = calloc(INFOBLOCK_SZ, 1); - if (!buf) - return -ENOMEM; + if (!buf) { + rc = -ENOMEM; + goto out; + } switch (util_nsmode(param.mode)) { case NDCTL_NS_MODE_FSDAX: