From patchwork Mon Jan 14 20:07:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10763371 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 27F1614E5 for ; Mon, 14 Jan 2019 20:16:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18CF52864F for ; Mon, 14 Jan 2019 20:16:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D8D32930E; Mon, 14 Jan 2019 20:16:44 +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 7FD672864F for ; Mon, 14 Jan 2019 20:16:43 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E401B21D0DE64; Mon, 14 Jan 2019 12:16:33 -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.120; helo=mga04.intel.com; envelope-from=dave.jiang@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 139EC21959CB2 for ; Mon, 14 Jan 2019 12:07:23 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jan 2019 12:07:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,478,1539673200"; d="scan'208";a="125991307" Received: from djiang5-desk3.ch.intel.com ([143.182.136.93]) by orsmga002.jf.intel.com with ESMTP; 14 Jan 2019 12:07:22 -0800 Subject: [PATCH v8 08/12] ndctl: add overwrite operation support From: Dave Jiang To: vishal.l.verma@intel.com, dan.j.williams@intel.com Date: Mon, 14 Jan 2019 13:07:20 -0700 Message-ID: <154749644027.63704.10436851571300063502.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <154749627829.63704.2987015129166185725.stgit@djiang5-desk3.ch.intel.com> References: <154749627829.63704.2987015129166185725.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/unknown-version 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: , Cc: linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Add support for overwrite to libndctl. The operation will be triggered by the sanitize-dimm command with -o switch. This will initiate the request to wipe the entire nvdimm. Success return of the command only indicate overwrite has started and does not indicate completion of overwrite. Signed-off-by: Dave Jiang --- Documentation/ndctl/ndctl-sanitize-dimm.txt | 4 ++++ ndctl/dimm.c | 21 +++++++++++++++++---- ndctl/lib/dimm.c | 8 ++++++++ ndctl/lib/keys.c | 21 ++++++++++++++++----- ndctl/lib/libndctl.sym | 2 ++ ndctl/libndctl.h | 8 ++++++++ 6 files changed, 55 insertions(+), 9 deletions(-) diff --git a/Documentation/ndctl/ndctl-sanitize-dimm.txt b/Documentation/ndctl/ndctl-sanitize-dimm.txt index 79629964..a1a43bdd 100644 --- a/Documentation/ndctl/ndctl-sanitize-dimm.txt +++ b/Documentation/ndctl/ndctl-sanitize-dimm.txt @@ -35,4 +35,8 @@ include::xable-dimm-options.txt[] Replaces encryption keys and securely erases the data. This does not change label data. This is the default sanitize method. +-o:: +--ovewrite:: + Wipe the entire DIMM, including label data. Can take significant time. + include::../copyright.txt[] diff --git a/ndctl/dimm.c b/ndctl/dimm.c index a91b40d5..799823d6 100644 --- a/ndctl/dimm.c +++ b/ndctl/dimm.c @@ -48,6 +48,7 @@ static struct parameters { const char *key_path; const char *master_key; bool crypto_erase; + bool overwrite; bool force; bool json; bool verbose; @@ -910,7 +911,7 @@ static int action_sanitize_dimm(struct ndctl_dimm *dimm, * Setting crypto erase to be default. The other method will be * overwrite. */ - if (!param.crypto_erase) { + if (!param.crypto_erase && !param.overwrite) { param.crypto_erase = true; printf("No santize method passed in, default to crypto-erase\n"); } @@ -921,6 +922,12 @@ static int action_sanitize_dimm(struct ndctl_dimm *dimm, return rc; } + if (param.overwrite) { + rc = ndctl_dimm_overwrite_key(dimm, param.key_path); + if (rc < 0) + return rc; + } + return 0; } @@ -1023,7 +1030,9 @@ OPT_STRING('m', "master-key", ¶m.master_key, ":", \ #define SANITIZE_OPTIONS() \ OPT_BOOLEAN('c', "crypto-erase", ¶m.crypto_erase, \ - "crypto erase a dimm") + "crypto erase a dimm"), \ +OPT_BOOLEAN('o', "overwrite", ¶m.overwrite, \ + "overwrite a dimm") static const struct option read_options[] = { BASE_OPTIONS(), @@ -1361,7 +1370,11 @@ int cmd_sanitize_dimm(int argc, const char **argv, void *ctx) sanitize_options, "ndctl sanitize-dimm [..] []"); - fprintf(stderr, "sanitized %d nmem%s.\n", count >= 0 ? count : 0, - count > 1 ? "s" : ""); + if (param.overwrite) + fprintf(stderr, "overwrite issued for %d nmem%s.\n", + count >= 0 ? count : 0, count > 1 ? "s" : ""); + else + fprintf(stderr, "sanitized %d nmem%s.\n", + count >= 0 ? count : 0, count > 1 ? "s" : ""); return count >= 0 ? 0 : EXIT_FAILURE; } diff --git a/ndctl/lib/dimm.c b/ndctl/lib/dimm.c index 285e09ce..f27b966c 100644 --- a/ndctl/lib/dimm.c +++ b/ndctl/lib/dimm.c @@ -685,3 +685,11 @@ NDCTL_EXPORT int ndctl_dimm_secure_erase(struct ndctl_dimm *dimm, long key) sprintf(buf, "erase %ld\n", key); return write_security(dimm, buf); } + +NDCTL_EXPORT int ndctl_dimm_overwrite(struct ndctl_dimm *dimm, long key) +{ + char buf[SYSFS_ATTR_SIZE]; + + sprintf(buf, "overwrite %ld\n", key); + return write_security(dimm, buf); +} diff --git a/ndctl/lib/keys.c b/ndctl/lib/keys.c index 39c4143c..beb5ab3b 100644 --- a/ndctl/lib/keys.c +++ b/ndctl/lib/keys.c @@ -92,6 +92,7 @@ NDCTL_EXPORT char *ndctl_load_key_blob(struct ndctl_ctx *ctx, err(ctx, "stat: %s\n", strerror(errno)); return NULL; } + if ((st.st_mode & S_IFMT) != S_IFREG) { err(ctx, "%s not a regular file\n", path); return NULL; @@ -418,10 +419,11 @@ static int check_key_run_and_discard(struct ndctl_dimm *dimm, key = dimm_check_key(dimm, false); if (key < 0) { key = dimm_load_key(dimm, false, keypath); - if (key < 0) { + if (key < 0 && run_op != ndctl_dimm_overwrite) { err(ctx, "Unable to load key\n"); return -ENOKEY; - } + } else + key = 0; } rc = run_op(dimm, key); @@ -431,9 +433,11 @@ static int check_key_run_and_discard(struct ndctl_dimm *dimm, return rc; } - rc = dimm_remove_key(dimm, false, keypath); - if (rc < 0) - err(ctx, "Unable to cleanup key.\n"); + if (key) { + rc = dimm_remove_key(dimm, false, keypath); + if (rc < 0) + err(ctx, "Unable to cleanup key.\n"); + } return 0; } @@ -450,3 +454,10 @@ NDCTL_EXPORT int ndctl_dimm_secure_erase_key(struct ndctl_dimm *dimm, return check_key_run_and_discard(dimm, ndctl_dimm_secure_erase, "crypto erase", keypath); } + +NDCTL_EXPORT int ndctl_dimm_overwrite_key(struct ndctl_dimm *dimm, + const char *keypath) +{ + return check_key_run_and_discard(dimm, ndctl_dimm_overwrite, + "overwrite", keypath); +} diff --git a/ndctl/lib/libndctl.sym b/ndctl/lib/libndctl.sym index bd85651e..ba9af99e 100644 --- a/ndctl/lib/libndctl.sym +++ b/ndctl/lib/libndctl.sym @@ -399,4 +399,6 @@ global: ndctl_dimm_freeze_security; ndctl_dimm_secure_erase; ndctl_dimm_secure_erase_key; + ndctl_dimm_overwrite; + ndctl_dimm_overwrite_key; } LIBNDCTL_18; diff --git a/ndctl/libndctl.h b/ndctl/libndctl.h index 9decc937..bcfcdfa5 100644 --- a/ndctl/libndctl.h +++ b/ndctl/libndctl.h @@ -706,6 +706,7 @@ int ndctl_dimm_update_passphrase(struct ndctl_dimm *dimm, int ndctl_dimm_disable_passphrase(struct ndctl_dimm *dimm, long key); int ndctl_dimm_freeze_security(struct ndctl_dimm *dimm); int ndctl_dimm_secure_erase(struct ndctl_dimm *dimm, long key); +int ndctl_dimm_overwrite(struct ndctl_dimm *dimm, long key); enum ndctl_key_type { ND_USER_KEY, @@ -720,6 +721,7 @@ int ndctl_dimm_update_key(struct ndctl_dimm *dimm, const char *master, int ndctl_dimm_disable_key(struct ndctl_dimm *dimm, const char *keypath); int ndctl_dimm_secure_erase_key(struct ndctl_dimm *dimm, const char *keypath); +int ndctl_dimm_overwrite_key(struct ndctl_dimm *dimm, const char *keypath); #else static inline int ndctl_dimm_enable_key(struct ndctl_dimm *dimm, const char *master, const char *keypath) @@ -744,6 +746,12 @@ static inline int ndctl_dimm_secure_erase_key(struct ndctl_dimm *dimm, { return -EOPNOTSUPP; } + +static inline int ndctl_dimm_overwrite_key(struct ndctl_dimm *dimm, + const char *keypath) +{ + return -EOPNOTSUPP; +} #endif #define ND_KEY_DESC_SIZE 128