From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9E08C06510 for ; Mon, 1 Jul 2019 18:27:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B76E221721 for ; Mon, 1 Jul 2019 18:27:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562005655; bh=RmiFi9tzptxJ/Z6+W7fN3Dap7wQkvqwPSafCyDX4i/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zzyFNyNvUb8nJKMnSj4Amd95p6L4F4f5+pzHszmdSDsi6s7eIwBslzKKpiN8wOtun yUlY/GUVn54SfwBGv6iIQkJohjx74nC9siUFEjv56O4OjyWMYb6XzFmHTp5TSzOxdc FgHHngSyhH16YXm0cIdoRCeUwBW1vqNRhHmxxU0c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbfGAS1d (ORCPT ); Mon, 1 Jul 2019 14:27:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:42118 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbfGAS1b (ORCPT ); Mon, 1 Jul 2019 14:27:31 -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 CA5A121850; Mon, 1 Jul 2019 18:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562005650; bh=RmiFi9tzptxJ/Z6+W7fN3Dap7wQkvqwPSafCyDX4i/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oe5fbBDPIAdyID+5Xi/P0Dr1zN2RHZhC41movJiM1sFaXIZETwG85Jcu6ySi41NZA 1+8YNNkqBO2I9avjZGmsR23YSGChQilOuEVdVMON+5ZoKHDxeBYVoyAblXidoe6Svv 46rRYR27TKVawylFIOJyyQtCDYCqrWo+YBvHG/jY= From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim , "Theodore Y . Ts'o" , Victor Hsieh Subject: [RFC PATCH v3 7/8] generic: test using fs-verity and fscrypt simultaneously Date: Mon, 1 Jul 2019 11:25:46 -0700 Message-Id: <20190701182547.165856-8-ebiggers@kernel.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190701182547.165856-1-ebiggers@kernel.org> References: <20190701182547.165856-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers This primarily verifies correct ordering of the hooks for each feature: fscrypt needs to be first. Signed-off-by: Eric Biggers --- tests/generic/904 | 80 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/904.out | 12 +++++++ tests/generic/group | 1 + 3 files changed, 93 insertions(+) create mode 100755 tests/generic/904 create mode 100644 tests/generic/904.out diff --git a/tests/generic/904 b/tests/generic/904 new file mode 100755 index 00000000..61bdae22 --- /dev/null +++ b/tests/generic/904 @@ -0,0 +1,80 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2018 Google LLC +# +# FS QA Test generic/904 +# +# Test using fs-verity and fscrypt simultaneously. This primarily verifies +# correct ordering of the hooks for each feature: fscrypt needs to be first. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/verity +. ./common/encrypt + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch_verity +_require_scratch_encryption +_require_command "$KEYCTL_PROG" keyctl + +_scratch_mkfs_encrypted_verity &>> $seqres.full +_scratch_mount + +fsv_orig_file=$tmp.file +edir=$SCRATCH_MNT/edir +fsv_file=$edir/file.fsv + +# Set up an encrypted directory. +_new_session_keyring +keydesc=$(_generate_encryption_key) +mkdir $edir +_set_encpolicy $edir $keydesc + +# Create a file within the encrypted directory and enable verity on it. +# Then check that it has an encryption policy as well. +head -c 100000 /dev/zero > $fsv_orig_file +cp $fsv_orig_file $fsv_file +_fsv_enable $fsv_file +echo +$XFS_IO_PROG -r -c "get_encpolicy" $fsv_file | _filter_scratch \ + | sed 's/Master key descriptor:.*/Master key descriptor: 0000000000000000/' +echo + +# Verify that the file contents are as expected. This should be going through +# both the decryption and verity I/O paths. +cmp $fsv_orig_file $fsv_file && echo "Files matched" + +# Just in case, try again after a mount cycle to empty the page cache. +_scratch_cycle_mount +cmp $fsv_orig_file $fsv_file && echo "Files matched" + +# Corrupt some bytes as a sanity check that fs-verity is really working. +# This also verifies that the data on-disk is really encrypted, since otherwise +# the data being written here would be identical to the old data. +head -c 1000 /dev/zero | _fsv_scratch_corrupt_bytes $fsv_file 50000 +md5sum $fsv_file |& _filter_scratch + +# success, all done +status=0 +exit diff --git a/tests/generic/904.out b/tests/generic/904.out new file mode 100644 index 00000000..5f4e249a --- /dev/null +++ b/tests/generic/904.out @@ -0,0 +1,12 @@ +QA output created by 904 + +Encryption policy for SCRATCH_MNT/edir/file.fsv: + Policy version: 0 + Master key descriptor: 0000000000000000 + Contents encryption mode: 1 (AES-256-XTS) + Filenames encryption mode: 4 (AES-256-CTS) + Flags: 0x02 + +Files matched +Files matched +md5sum: SCRATCH_MNT/edir/file.fsv: Input/output error diff --git a/tests/generic/group b/tests/generic/group index 97fd5a32..cc30a30b 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -564,3 +564,4 @@ 901 auto quick verity 902 auto quick verity 903 auto quick verity +904 auto quick verity encrypt -- 2.22.0.410.gd8fdbe21b5-goog