From patchwork Thu Jan 24 23:07:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10780207 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 3125F1399 for ; Thu, 24 Jan 2019 23:07:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C6B72F4EF for ; Thu, 24 Jan 2019 23:07:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D6BF2F525; Thu, 24 Jan 2019 23:07:10 +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 C5A362F4EF for ; Thu, 24 Jan 2019 23:07:07 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 828CD211B85CD; Thu, 24 Jan 2019 15:07:07 -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.93; helo=mga11.intel.com; envelope-from=dave.jiang@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 20CEA211B81A5 for ; Thu, 24 Jan 2019 15:07:05 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2019 15:07:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,518,1539673200"; d="scan'208";a="137561421" Received: from djiang5-desk3.ch.intel.com ([143.182.136.93]) by fmsmga002.fm.intel.com with ESMTP; 24 Jan 2019 15:07:04 -0800 Subject: [PATCH v10 00/12] ndctl: add security support From: Dave Jiang To: vishal.l.verma@intel.com, dan.j.williams@intel.com Date: Thu, 24 Jan 2019 16:07:04 -0700 Message-ID: <154837084784.37086.4597479371733088393.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 The following series implements mechanisms that utilize the sysfs knobs provided by the kernel in order to support the Intel DSM v1.8 spec that provides security to NVDIMM. The following abilities are added: 1. display security state 2. enable/update passphrase 3. disable passphrase 4. freeze security 5. secure erase 6. overwrite 7. master passphrase enable/update v10: - Remove install-encrypt-key support. setup-passphrase will take a master key handle in order to allow per NVDIMM master key. update-passphrase can take optional master key handle. (Dan) - Rebased to latest ndctl. (Vishal) - Moved the key management calls to ndctl/util and stop exporting. (Dan) v9: - Add install-encrypt-key command. (Dan) - Change enable-passphrase to setup-passphrase. (Dan) - Change disable-passphrase to remove-passphrase. (Dan) - Change ndctl_dimm_get_security() to return state directly and remove ndctl_dimm_security_supported(). (Dan) - Remove ND_SECURITY_UNSUPPORTED state - change ND_SECURITY_* to NDCTL_SECURITY_* - Fix man page issues (Dan, Jane) - Define NDCTL_KEYSDIR in config.h (Dan) - Break check_key_run_and_discard() to 3 helper functions. (Dan) - Remove key path input parameter. (Dan) - Remove master key input parameter. (Dan) - Fixup various issues in security unit test script. (Vishal) v8: - Additional cleanup on test script. (Vishal) - Change load-keys script into internal command for ndctl. (Dan) v7: - Added option to provide path to key directory. (Vishal) - Cleaned up shell scripts. (Vishal) - Cleaned up documentation. (Vishal) - Addressed various comments from Vishal. v6: - Fix spelling and grammar errors for documentation. (Jing) - Change bool for indicate master passphrase and old passphrase to enum. - Fix key load script master key name. - Update to match v15 of kernel patch series. v5: - Updated to match latest kernel interface (encrypted keys) - Added overwrite support - Added support for DSM v1.8 master passphrase operations - Removed upcall related code - Moved security state to enum (Dan) - Change security output "security_state" to just "security". (Dan) - Break out enable and update passphrase operation. (Dan) - Security build can be compiled out when keyutils does not exist. (Dan) - Move all keyutils related operations to libndctl. (Dan) v4: - Updated to match latest kernel interface. - Added unit test for all security calls v3: - Added support to inject keys in order to update nvdimm security. v2: - Fixup the upcall util to match recent kernel updates for nvdimm security. --- Dave Jiang (12): ndctl: add support for display security state ndctl: add passphrase update to ndctl ndctl: add disable security support ndctl: add support for freeze security ndctl: add support for sanitize dimm ndctl: add unit test for security ops (minus overwrite) ndctl: add modprobe conf file and load-keys ndctl command ndctl: add overwrite operation support ndctl: add wait-overwrite support ndctl: master phassphrase management support ndctl: add master secure erase support ndctl: documentation for security and key management Documentation/ndctl/Makefile.am | 10 Documentation/ndctl/intel-nvdimm-security.txt | 141 +++++ Documentation/ndctl/ndctl-freeze-security.txt | 60 ++ Documentation/ndctl/ndctl-list.txt | 8 Documentation/ndctl/ndctl-load-keys.txt | 45 ++ Documentation/ndctl/ndctl-remove-passphrase.txt | 28 + Documentation/ndctl/ndctl-sanitize-dimm.txt | 52 ++ Documentation/ndctl/ndctl-setup-passphrase.txt | 54 ++ Documentation/ndctl/ndctl-update-passphrase.txt | 58 ++ Documentation/ndctl/ndctl-wait-overwrite.txt | 31 + Makefile.am | 4 configure.ac | 17 + contrib/nvdimm-security.conf | 1 ndctl.spec.in | 3 ndctl/Makefile.am | 6 ndctl/builtin.h | 7 ndctl/dimm.c | 242 ++++++++- ndctl/lib/Makefile.am | 4 ndctl/lib/dimm.c | 183 ++++++ ndctl/lib/libndctl.sym | 9 ndctl/libndctl.h | 28 + ndctl/load-keys.c | 256 +++++++++ ndctl/ndctl.c | 7 ndctl/util/keys.c | 650 +++++++++++++++++++++++ ndctl/util/keys.h | 60 ++ test/Makefile.am | 4 test/security.sh | 220 ++++++++ util/json.c | 17 + 28 files changed, 2193 insertions(+), 12 deletions(-) create mode 100644 Documentation/ndctl/intel-nvdimm-security.txt create mode 100644 Documentation/ndctl/ndctl-freeze-security.txt create mode 100644 Documentation/ndctl/ndctl-load-keys.txt create mode 100644 Documentation/ndctl/ndctl-remove-passphrase.txt create mode 100644 Documentation/ndctl/ndctl-sanitize-dimm.txt create mode 100644 Documentation/ndctl/ndctl-setup-passphrase.txt create mode 100644 Documentation/ndctl/ndctl-update-passphrase.txt create mode 100644 Documentation/ndctl/ndctl-wait-overwrite.txt create mode 100644 contrib/nvdimm-security.conf create mode 100644 ndctl/load-keys.c create mode 100644 ndctl/util/keys.c create mode 100644 ndctl/util/keys.h create mode 100755 test/security.sh --