From patchwork Thu Mar 28 22:26:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 10876041 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 29BC51669 for ; Thu, 28 Mar 2019 22:26:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10E4628B45 for ; Thu, 28 Mar 2019 22:26:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 042EE28FE8; Thu, 28 Mar 2019 22:26:09 +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 9CC2428B45 for ; Thu, 28 Mar 2019 22:26:08 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8E589211EB834; Thu, 28 Mar 2019 15:26:08 -0700 (PDT) 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=134.134.136.100; helo=mga07.intel.com; envelope-from=dave.jiang@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 924C7211E9FBD for ; Thu, 28 Mar 2019 15:26:06 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2019 15:26:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,282,1549958400"; d="scan'208";a="333002027" Received: from djiang5-desk3.ch.intel.com ([143.182.136.93]) by fmsmga005.fm.intel.com with ESMTP; 28 Mar 2019 15:26:05 -0700 Subject: [PATCH v2 3/3] ndctl: add unit test for load-keys From: Dave Jiang To: vishal.l.verma@intel.com Date: Thu, 28 Mar 2019 15:26:05 -0700 Message-ID: <155381190641.13778.16998322434894711396.stgit@djiang5-desk3.ch.intel.com> In-Reply-To: <155381182887.13778.15556671056565903543.stgit@djiang5-desk3.ch.intel.com> References: <155381182887.13778.15556671056565903543.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 to security.sh to test load-keys for user keys. Signed-off-by: Dave Jiang --- V2: - Add quotes around $masterkey. (Vishal) - Change fail to failed in output. (Vishal) test/security.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/test/security.sh b/test/security.sh index 1b7a9a1a..8a36265f 100755 --- a/test/security.sh +++ b/test/security.sh @@ -6,8 +6,10 @@ rc=77 dev="" id="" keypath="/etc/ndctl/keys" -masterkey="nvdimm-master-test" -masterpath="$keypath/$masterkey" +masterkey="nvdimm-master" +masterpath="$keypath/$masterkey.blob" +backup_key=0 +backup_handle=0 . ./common @@ -32,6 +34,15 @@ setup_keys() mkdir -p "$keypath" fi + if [ -f "$masterpath" ]; then + mv "$masterpath" "$masterpath.bak" + $backup_key=1 + fi + if [ -f "$keypath/tpm.handle" ]; then + mv "$keypath/tpm.handle" "$keypath/tmp.handle.bak" + $backup_handle=1 + fi + dd if=/dev/urandom bs=1 count=32 2>/dev/null | keyctl padd user "$masterkey" @u keyctl pipe "$(keyctl search @u user $masterkey)" > "$masterpath" } @@ -43,16 +54,25 @@ test_cleanup() fi if keyctl search @u user "$masterkey"; then - keyctl unlink "$(keyctl search @u user $masterkey)" + keyctl unlink "$(keyctl search @u user "$masterkey")" fi if [ -f "$keypath"/nvdimm_"$id"_"$(hostname)".blob ]; then rm -f "$keypath"/nvdimm_"$id"_"$(hostname)".blob fi +} +post_cleanup() +{ if [ -f $masterpath ]; then rm -f "$masterpath" fi + if [ "$backup_key" -eq 1 ]; then + mv "$masterpath.bak" "$masterpath" + fi + if [ "$backup_handle" -eq 1 ]; then + mv "$keypath/tpm.handle.bak" "$keypath/tmp.handle" + fi } lock_dimm() @@ -168,8 +188,8 @@ test_4_security_unlock() remove_passphrase } -# this should always be the last test. with security frozen, nfit_test must -# be removed and is no longer usable +# This should always be the last nvdimm security test. +# with security frozen, nfit_test must be removed and is no longer usable test_5_security_freeze() { setup_passphrase @@ -188,6 +208,33 @@ test_5_security_freeze() fi } +test_6_load_keys() +{ + if keyctl search @u encrypted nvdimm:"$id"; then + keyctl unlink "$(keyctl search @u encrypted nvdimm:"$id")" + fi + + if keyctl search @u user "$masterkey"; then + keyctl unlink "$(keyctl search @u user "$masterkey")" + fi + + $NDCTL load-keys + + if keyctl search @u user "$masterkey"; then + echo "master key loaded" + else + echo "master key failed to loaded" + err "$LINENO" + fi + + if keyctl search @u encrypted nvdimm:"$id"; then + echo "dimm key loaded" + else + echo "dimm key failed to load" + err "$LINENO" + fi +} + check_min_kver "5.0" || do_skip "may lack security handling" uid="$(keyctl show | grep -Eo "_uid.[0-9]+" | head -1 | cut -d. -f2-)" if [ "$uid" -ne 0 ]; then @@ -210,11 +257,18 @@ test_3_security_setup_and_erase echo "Test 4, unlock dimm" test_4_security_unlock -# Freeze should always be run last because it locks security state and require -# nfit_test module unload. +# Freeze should always be the last nvdimm security test because it locks +# security state and require nfit_test module unload. However, this does +# not impact any key management testing via libkeyctl. echo "Test 5, freeze security" test_5_security_freeze +# Load-keys is independent of actual nvdimm security and is part of key +# mangement testing. +echo "Test 6, test load-keys" +test_6_load_keys + test_cleanup +post_cleanup _cleanup exit 0