From patchwork Fri Sep 20 00:37:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 11153659 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 EAE234324 for ; Fri, 20 Sep 2019 00:38:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9D74214AF for ; Fri, 20 Sep 2019 00:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568939886; bh=X/Ktp2/b4WZSsWJILrzfzb54VmVSNlG0XkBJHTbnyuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ynkb1HkmsIQ3qBNCMF/7Rb3F5bLFR9CUQ551h4yB1cxGK9owch8b6l8g3oFB7wHeN CvwxcDNRx+qY0Fs5n+q8S3GDBidYz3SH9HULlQz2+41+mEeX4X4ZEwx2RW/8/6tcyv kRfHbCWRobxLA5GRdVWdDIu9Ng+WVXV1YXbE9RKg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394428AbfITAiF (ORCPT ); Thu, 19 Sep 2019 20:38:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:41818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393288AbfITAiF (ORCPT ); Thu, 19 Sep 2019 20:38:05 -0400 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C6CC221924; Fri, 20 Sep 2019 00:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568939883; bh=X/Ktp2/b4WZSsWJILrzfzb54VmVSNlG0XkBJHTbnyuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bYs4RUhSY2+wbBu3IBMqOLKlNS28Ld7nEiKvT2/A4fmZns0ouJAkPZo0pIwn6ACti WeGmp4oiTt/+/kMe4f77DvKMDcDBw2pB4GlEVrmsTdjO5jksl87DSpjlvG8UjybPJU KBi8r8o9I+ekBSsPm/pzSQ75/Ut8ypWucTO9nsdU= From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org Subject: [PATCH v2 3/9] common/encrypt: support checking for v2 encryption policy support Date: Thu, 19 Sep 2019 17:37:47 -0700 Message-Id: <20190920003753.40281-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.23.0.351.gc4317032e6-goog In-Reply-To: <20190920003753.40281-1-ebiggers@kernel.org> References: <20190920003753.40281-1-ebiggers@kernel.org> MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org From: Eric Biggers Allow passing '-v 2' to _require_scratch_encryption() to check for v2 encryption policy support on the scratch device, and for xfs_io support for setting and getting v2 encryption policies. Signed-off-by: Eric Biggers --- common/encrypt | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/common/encrypt b/common/encrypt index a086e80f..eec585a0 100644 --- a/common/encrypt +++ b/common/encrypt @@ -6,12 +6,13 @@ # # _require_scratch_encryption [-c CONTENTS_MODE] [-n FILENAMES_MODE] +# [-v POLICY_VERSION] # # Require encryption support on the scratch device. # -# This checks for support for the default type of encryption policy (AES-256-XTS -# and AES-256-CTS). Options can be specified to also require support for a -# different type of encryption policy. +# This checks for support for the default type of encryption policy (v1 with +# AES-256-XTS and AES-256-CTS). Options can be specified to also require +# support for a different type of encryption policy. # _require_scratch_encryption() { @@ -68,14 +69,19 @@ _require_encryption_policy_support() local mnt=$1 local dir=$mnt/tmpdir local set_encpolicy_args="" + local policy_version=1 local c OPTIND=2 - while getopts "c:n:" c; do + while getopts "c:n:v:" c; do case $c in c|n) set_encpolicy_args+=" -$c $OPTARG" ;; + v) + set_encpolicy_args+=" -$c $OPTARG" + policy_version=$OPTARG + ;; *) _fail "Unrecognized option '$c'" ;; @@ -87,10 +93,26 @@ _require_encryption_policy_support() >> $seqres.full mkdir $dir - _require_command "$KEYCTL_PROG" keyctl - _new_session_keyring - local keydesc=$(_generate_session_encryption_key) - if _set_encpolicy $dir $keydesc $set_encpolicy_args \ + if (( policy_version > 1 )); then + _require_xfs_io_command "get_encpolicy" "-t" + local output=$(_get_encpolicy $dir -t) + if [ "$output" != "supported" ]; then + if [ "$output" = "unsupported" ]; then + _notrun "kernel does not support $FSTYP encryption v2 API" + fi + _fail "Unexpected output from 'get_encpolicy -t': $output" + fi + # Both the kernel and xfs_io support v2 encryption policies, and + # therefore also filesystem-level keys -- since that's the only + # way to provide keys for v2 policies. + local raw_key=$(_generate_raw_encryption_key) + local keyspec=$(_add_enckey $mnt "$raw_key" | awk '{print $NF}') + else + _require_command "$KEYCTL_PROG" keyctl + _new_session_keyring + local keyspec=$(_generate_session_encryption_key) + fi + if _set_encpolicy $dir $keyspec $set_encpolicy_args \ 2>&1 >>$seqres.full | egrep -q 'Invalid argument'; then _notrun "kernel does not support encryption policy: '$set_encpolicy_args'" fi @@ -103,7 +125,9 @@ _require_encryption_policy_support() if ! echo foo > $dir/file; then _notrun "encryption policy '$set_encpolicy_args' is unusable; probably missing kernel crypto API support" fi - $KEYCTL_PROG clear @s + if (( policy_version <= 1 )); then + $KEYCTL_PROG clear @s + fi rm -r $dir }