From patchwork Sat Feb 2 01:52:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10794041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 827DC159A for ; Sat, 2 Feb 2019 01:53:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EDD632F17 for ; Sat, 2 Feb 2019 01:53:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E7D9330C8; Sat, 2 Feb 2019 01:53:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3B3032F17 for ; Sat, 2 Feb 2019 01:53:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 80AC2211C64B3; Fri, 1 Feb 2019 17:53:00 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 0AB6A211B6C26 for ; Fri, 1 Feb 2019 17:52:58 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 17:52:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="123324118" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by orsmga003.jf.intel.com with ESMTP; 01 Feb 2019 17:52:58 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 1/4] ndctl, keys: fix a memory leak in dimm_create_key() Date: Fri, 1 Feb 2019 18:52:50 -0700 Message-Id: <20190202015253.20051-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Static analysis reports that we are leaking 'fp' in the above function. Add an fclose() to close the leak. Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- ndctl/util/keys.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ndctl/util/keys.c b/ndctl/util/keys.c index 85818c0..acc2ff3 100644 --- a/ndctl/util/keys.c +++ b/ndctl/util/keys.c @@ -260,14 +260,15 @@ static key_serial_t dimm_create_key(struct ndctl_dimm *dimm, wrote = fwrite(buffer, 1, size, fp); if (wrote != size) { - if (wrote == -1) - rc = -errno; - else - rc = -EIO; - fprintf(stderr, "Failed to write to %s: %s\n", - path, strerror(-rc)); - free(buffer); - return rc; + if (wrote == -1) + rc = -errno; + else + rc = -EIO; + fprintf(stderr, "Failed to write to %s: %s\n", + path, strerror(-rc)); + fclose(fp); + free(buffer); + return rc; } fclose(fp); From patchwork Sat Feb 2 01:52:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10794043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F1BC184E for ; Sat, 2 Feb 2019 01:53:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E8D332F17 for ; Sat, 2 Feb 2019 01:53:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 017D0330C7; Sat, 2 Feb 2019 01:53:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D40A4330A5 for ; Sat, 2 Feb 2019 01:53:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9715B211C64B6; Fri, 1 Feb 2019 17:53:00 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 5BA18211B6C26 for ; Fri, 1 Feb 2019 17:52:59 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 17:52:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="123324123" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by orsmga003.jf.intel.com with ESMTP; 01 Feb 2019 17:52:58 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 2/4] ndctl, keys: fix a resource leak in verify_kek() Date: Fri, 1 Feb 2019 18:52:51 -0700 Message-Id: <20190202015253.20051-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190202015253.20051-1-vishal.l.verma@intel.com> References: <20190202015253.20051-1-vishal.l.verma@intel.com> MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Static analysis reports that we were leaking key_handle in the above function. Fix the error handling to properly free it for every error case. Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- ndctl/util/keys.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ndctl/util/keys.c b/ndctl/util/keys.c index acc2ff3..c1f2e84 100644 --- a/ndctl/util/keys.c +++ b/ndctl/util/keys.c @@ -393,6 +393,7 @@ static int verify_kek(struct ndctl_dimm *dimm, const char *kek) { char *type, *desc, *key_handle; key_serial_t key; + int rc = 0; key_handle = strdup(kek); if (!key_handle) @@ -401,29 +402,34 @@ static int verify_kek(struct ndctl_dimm *dimm, const char *kek) type = strtok(key_handle, ":"); if (!type) { fprintf(stderr, "No key type found for kek handle\n"); - return -EINVAL; + rc = -EINVAL; + goto out; } if (strcmp(type, "trusted") != 0 && strcmp(type, "user") != 0) { fprintf(stderr, "No such key type: %s", type); - return -EINVAL; + rc = -EINVAL; + goto out; } desc = strtok(NULL, ":"); if (!desc) { fprintf(stderr, "No description found for kek handle\n"); - return -EINVAL; + rc = -EINVAL; + goto out; } key = keyctl_search(KEY_SPEC_USER_KEYRING, type, desc, 0); if (key < 0) { fprintf(stderr, "No key encryption key found\n"); - return key; + rc = key; + goto out; } +out: free(key_handle); - return 0; + return rc; } int ndctl_dimm_setup_key(struct ndctl_dimm *dimm, const char *kek, From patchwork Sat Feb 2 01:52:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10794045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 670791390 for ; Sat, 2 Feb 2019 01:53:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FD2932F17 for ; Sat, 2 Feb 2019 01:53:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43A9D330A5; Sat, 2 Feb 2019 01:53:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F40A3330B3 for ; Sat, 2 Feb 2019 01:53:01 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AABEB211C64BC; Fri, 1 Feb 2019 17:53:01 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 3CF92211C64B1 for ; Fri, 1 Feb 2019 17:53:00 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 17:53:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="123324127" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by orsmga003.jf.intel.com with ESMTP; 01 Feb 2019 17:52:59 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 3/4] libndctl: fix a couple of theoretical buffer overruns Date: Fri, 1 Feb 2019 18:52:52 -0700 Message-Id: <20190202015253.20051-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190202015253.20051-1-vishal.l.verma@intel.com> References: <20190202015253.20051-1-vishal.l.verma@intel.com> MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Static analysis reports that the ndctl_dimm_get_security() function can overflow 'buf'. Just above it, ndctl_dimm_get_available_labels() seems to make the same mistake. Fix both of these by allocating a buffer of the correct size. Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- ndctl/lib/dimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ndctl/lib/dimm.c b/ndctl/lib/dimm.c index 0a4ca79..22cf4e1 100644 --- a/ndctl/lib/dimm.c +++ b/ndctl/lib/dimm.c @@ -582,7 +582,7 @@ NDCTL_EXPORT unsigned long ndctl_dimm_get_available_labels( struct ndctl_ctx *ctx = ndctl_dimm_get_ctx(dimm); char *path = dimm->dimm_buf; int rc, len = dimm->buf_len; - char buf[20]; + char buf[SYSFS_ATTR_SIZE]; if (snprintf(path, len, "%s/available_slots", dimm->dimm_path) >= len) { err(ctx, "%s: buffer too small!\n", @@ -605,8 +605,8 @@ NDCTL_EXPORT enum ndctl_security_state ndctl_dimm_get_security( { struct ndctl_ctx *ctx = ndctl_dimm_get_ctx(dimm); char *path = dimm->dimm_buf; + char buf[SYSFS_ATTR_SIZE]; int len = dimm->buf_len; - char buf[64]; int rc; if (snprintf(path, len, "%s/security", dimm->dimm_path) >= len) { From patchwork Sat Feb 2 01:52:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10794047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DE631390 for ; Sat, 2 Feb 2019 01:53:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C8CE32F17 for ; Sat, 2 Feb 2019 01:53:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E3EC330B3; Sat, 2 Feb 2019 01:53:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2F36432F17 for ; Sat, 2 Feb 2019 01:53:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C5E2E211C7F00; Fri, 1 Feb 2019 17:53:02 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 0003C21BADAB2 for ; Fri, 1 Feb 2019 17:53:00 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 17:53:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,550,1539673200"; d="scan'208";a="123324131" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by orsmga003.jf.intel.com with ESMTP; 01 Feb 2019 17:53:00 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 4/4] ndctl, load-keys: fix a resource leak in load_dimm_keys() Date: Fri, 1 Feb 2019 18:52:53 -0700 Message-Id: <20190202015253.20051-4-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190202015253.20051-1-vishal.l.verma@intel.com> References: <20190202015253.20051-1-vishal.l.verma@intel.com> MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Static analysis reports that we potentially leak 'fname' in the above function. Fix by freeing it as well as 'blob' in the exit path. Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- ndctl/load-keys.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ndctl/load-keys.c b/ndctl/load-keys.c index 184fa2d..95c4d4d 100644 --- a/ndctl/load-keys.c +++ b/ndctl/load-keys.c @@ -86,7 +86,7 @@ static int load_dimm_keys(struct loadkeys *lk_ctx) { int rc; struct dirent *dent; - char *fname, *id, *blob; + char *fname = NULL, *id, *blob = NULL; char desc[ND_KEY_DESC_SIZE]; int size, count = 0; key_serial_t key; @@ -142,6 +142,8 @@ static int load_dimm_keys(struct loadkeys *lk_ctx) printf("%d nvdimm keys loaded\n", count); + free(fname); + free(blob); return 0; }