From: Eric Biggers <ebiggers@kernel.org> To: fstests@vger.kernel.org Cc: Jaegeuk Kim <jaegeuk@kernel.org>, linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, "Theodore Y . Ts'o" <tytso@mit.edu>, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v4 4/8] generic: test access controls on the fs-verity ioctls Date: Mon, 30 Sep 2019 14:15:49 -0700 [thread overview] Message-ID: <20190930211553.64208-5-ebiggers@kernel.org> (raw) In-Reply-To: <20190930211553.64208-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> Test access controls on the fs-verity ioctls. FS_IOC_MEASURE_VERITY is allowed on any file, whereas FS_IOC_ENABLE_VERITY requires write access. Signed-off-by: Eric Biggers <ebiggers@google.com> --- tests/generic/901 | 73 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/901.out | 14 +++++++++ tests/generic/group | 1 + 3 files changed, 88 insertions(+) create mode 100755 tests/generic/901 create mode 100644 tests/generic/901.out diff --git a/tests/generic/901 b/tests/generic/901 new file mode 100755 index 00000000..56dab587 --- /dev/null +++ b/tests/generic/901 @@ -0,0 +1,73 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2018 Google LLC +# +# FS QA Test generic/901 +# +# Test access controls on the fs-verity ioctls. FS_IOC_MEASURE_VERITY is +# allowed on any file, whereas FS_IOC_ENABLE_VERITY requires write access. +# +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 + +# 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_user +_require_chattr ia + +_scratch_mkfs_verity &>> $seqres.full +_scratch_mount +fsv_file=$SCRATCH_MNT/file.fsv + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY doesn't require root" +echo foo > $fsv_file +chmod 666 $fsv_file +_user_do "$FSVERITY_PROG enable $fsv_file" + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires write access" +echo foo > $fsv_file >> $seqres.full +chmod 444 $fsv_file +_user_do "$FSVERITY_PROG enable $fsv_file" |& _filter_scratch + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires !append-only" +echo foo > $fsv_file >> $seqres.full +$CHATTR_PROG +a $fsv_file +$FSVERITY_PROG enable $fsv_file |& _filter_scratch +$CHATTR_PROG -a $fsv_file + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires !immutable" +echo foo > $fsv_file >> $seqres.full +$CHATTR_PROG +i $fsv_file +$FSVERITY_PROG enable $fsv_file |& _filter_scratch +$CHATTR_PROG -i $fsv_file + +_fsv_scratch_begin_subtest "FS_IOC_MEASURE_VERITY doesn't require root" +_fsv_create_enable_file $fsv_file >> $seqres.full +chmod 444 $fsv_file +su $qa_user -c "$FSVERITY_PROG measure $fsv_file" >> $seqres.full + +# success, all done +status=0 +exit diff --git a/tests/generic/901.out b/tests/generic/901.out new file mode 100644 index 00000000..a9e4c364 --- /dev/null +++ b/tests/generic/901.out @@ -0,0 +1,14 @@ +QA output created by 901 + +# FS_IOC_ENABLE_VERITY doesn't require root + +# FS_IOC_ENABLE_VERITY requires write access +Permission denied + +# FS_IOC_ENABLE_VERITY requires !append-only +ERROR: FS_IOC_ENABLE_VERITY failed on 'SCRATCH_MNT/file.fsv': Operation not permitted + +# FS_IOC_ENABLE_VERITY requires !immutable +ERROR: FS_IOC_ENABLE_VERITY failed on 'SCRATCH_MNT/file.fsv': Operation not permitted + +# FS_IOC_MEASURE_VERITY doesn't require root diff --git a/tests/generic/group b/tests/generic/group index 8c5212a1..a0450d42 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -571,3 +571,4 @@ 566 auto quick quota metadata 567 auto quick rw punch 900 auto quick verity +901 auto quick verity -- 2.23.0.444.g18eeb5a265-goog
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim <jaegeuk@kernel.org>, "Theodore Y . Ts'o" <tytso@mit.edu> Subject: [PATCH v4 4/8] generic: test access controls on the fs-verity ioctls Date: Mon, 30 Sep 2019 14:15:49 -0700 [thread overview] Message-ID: <20190930211553.64208-5-ebiggers@kernel.org> (raw) Message-ID: <20190930211549.2DkrOimJKr_75n7-dXoOiFMavuGlaveJjYx0L8VU9pI@z> (raw) In-Reply-To: <20190930211553.64208-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> Test access controls on the fs-verity ioctls. FS_IOC_MEASURE_VERITY is allowed on any file, whereas FS_IOC_ENABLE_VERITY requires write access. Signed-off-by: Eric Biggers <ebiggers@google.com> --- tests/generic/901 | 73 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/901.out | 14 +++++++++ tests/generic/group | 1 + 3 files changed, 88 insertions(+) create mode 100755 tests/generic/901 create mode 100644 tests/generic/901.out diff --git a/tests/generic/901 b/tests/generic/901 new file mode 100755 index 00000000..56dab587 --- /dev/null +++ b/tests/generic/901 @@ -0,0 +1,73 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2018 Google LLC +# +# FS QA Test generic/901 +# +# Test access controls on the fs-verity ioctls. FS_IOC_MEASURE_VERITY is +# allowed on any file, whereas FS_IOC_ENABLE_VERITY requires write access. +# +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 + +# 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_user +_require_chattr ia + +_scratch_mkfs_verity &>> $seqres.full +_scratch_mount +fsv_file=$SCRATCH_MNT/file.fsv + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY doesn't require root" +echo foo > $fsv_file +chmod 666 $fsv_file +_user_do "$FSVERITY_PROG enable $fsv_file" + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires write access" +echo foo > $fsv_file >> $seqres.full +chmod 444 $fsv_file +_user_do "$FSVERITY_PROG enable $fsv_file" |& _filter_scratch + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires !append-only" +echo foo > $fsv_file >> $seqres.full +$CHATTR_PROG +a $fsv_file +$FSVERITY_PROG enable $fsv_file |& _filter_scratch +$CHATTR_PROG -a $fsv_file + +_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires !immutable" +echo foo > $fsv_file >> $seqres.full +$CHATTR_PROG +i $fsv_file +$FSVERITY_PROG enable $fsv_file |& _filter_scratch +$CHATTR_PROG -i $fsv_file + +_fsv_scratch_begin_subtest "FS_IOC_MEASURE_VERITY doesn't require root" +_fsv_create_enable_file $fsv_file >> $seqres.full +chmod 444 $fsv_file +su $qa_user -c "$FSVERITY_PROG measure $fsv_file" >> $seqres.full + +# success, all done +status=0 +exit diff --git a/tests/generic/901.out b/tests/generic/901.out new file mode 100644 index 00000000..a9e4c364 --- /dev/null +++ b/tests/generic/901.out @@ -0,0 +1,14 @@ +QA output created by 901 + +# FS_IOC_ENABLE_VERITY doesn't require root + +# FS_IOC_ENABLE_VERITY requires write access +Permission denied + +# FS_IOC_ENABLE_VERITY requires !append-only +ERROR: FS_IOC_ENABLE_VERITY failed on 'SCRATCH_MNT/file.fsv': Operation not permitted + +# FS_IOC_ENABLE_VERITY requires !immutable +ERROR: FS_IOC_ENABLE_VERITY failed on 'SCRATCH_MNT/file.fsv': Operation not permitted + +# FS_IOC_MEASURE_VERITY doesn't require root diff --git a/tests/generic/group b/tests/generic/group index 8c5212a1..a0450d42 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -571,3 +571,4 @@ 566 auto quick quota metadata 567 auto quick rw punch 900 auto quick verity +901 auto quick verity -- 2.23.0.444.g18eeb5a265-goog
next prev parent reply other threads:[~2019-09-30 21:15 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-30 21:15 [PATCH v4 0/8] xfstests: add fs-verity tests Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` [PATCH v4 1/8] common/filter: add _filter_xfs_io_fiemap() Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` [PATCH v4 2/8] common/verity: add common functions for testing fs-verity Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` [PATCH v4 3/8] generic: test general behavior of verity files Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` Eric Biggers [this message] 2019-09-30 21:15 ` [PATCH v4 4/8] generic: test access controls on the fs-verity ioctls Eric Biggers 2019-09-30 21:15 ` [PATCH v4 5/8] generic: test corrupting verity files Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` [PATCH v4 6/8] generic: test that fs-verity is using the correct measurement values Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` [PATCH v4 7/8] generic: test using fs-verity and fscrypt simultaneously Eric Biggers 2019-09-30 21:15 ` Eric Biggers 2019-09-30 21:15 ` [PATCH v4 8/8] generic: test the fs-verity built-in signature verification support Eric Biggers 2019-09-30 21:15 ` Eric Biggers
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190930211553.64208-5-ebiggers@kernel.org \ --to=ebiggers@kernel.org \ --cc=fstests@vger.kernel.org \ --cc=jaegeuk@kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ --cc=tytso@mit.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).