On Mon, Dec 05, 2016 at 11:21:05AM -0800, Eric Biggers wrote: > Several kernel bugs were recently fixed regarding the constraints for > setting encryption policies. Add tests for these cases and a few more. > > Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> > --- > tests/generic/400 | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/400.out | 43 ++++++++++++++++ > tests/generic/group | 1 + > 3 files changed, 176 insertions(+) > create mode 100755 tests/generic/400 > create mode 100644 tests/generic/400.out > > diff --git a/tests/generic/400 b/tests/generic/400 > new file mode 100755 > index 0000000..6bcc65d > --- /dev/null > +++ b/tests/generic/400 > @@ -0,0 +1,132 @@ > +#! /bin/bash > +# FS QA Test generic/400 > +# > +# Test setting and getting encryption policies. > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2016 Google, Inc. All Rights Reserved. > +# > +# Author: Eric Biggers <ebiggers@xxxxxxxxxx> > +# > +# This program is free software; you can redistribute it and/or > +# modify it under the terms of the GNU General Public License as > +# published by the Free Software Foundation. > +# > +# This program is distributed in the hope that it would be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write the Free Software Foundation, > +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > +#----------------------------------------------------------------------- > +# > + > +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/encrypt > + > +# remove previous $seqres.full before test > +rm -f $seqres.full > + > +# real QA test starts here > +_supported_fs ext4 f2fs The supported fs for generic tests should be "generic", we rule out all unsupported filesystems by all the _require rules. All other tests have this problem. > +_supported_os Linux > +_require_xfs_io_command "get_encpolicy" > +_require_xfs_io_command "set_encpolicy" > +_require_scratch > +_require_encryption > +_require_user > + > +_scratch_mkfs_encrypted >> $seqres.full > +_scratch_mount > +cd $SCRATCH_MNT As Dave said, we usually don't cd to $SCRATCH_MNT, we usually do empty_dir=$SCRATCH_MNT/empty_dir mkdir $empty_dir <other tests on $empty_dir> And replace the actual $SCRATCH_MNT with "SCRATCH_MNT" by using _filter_scratch. You do this in patch "4/6" :) Thanks, Eryu > + > +check_no_policy() > +{ > + # When a file is unencrypted, FS_IOC_GET_ENCRYPTION_POLICY currently > + # fails with ENOENT on ext4 but with ENODATA on f2fs. TODO: it's > + # planned to consistently use ENODATA. For now this test accepts both. > + $XFS_IO_PROG -c "get_encpolicy" $1 |& > + sed -e 's/No such file or directory/No data available/' > +} > + > +# Should be able to set an encryption policy on an empty directory > +echo -e "\n*** Setting encryption policy on empty directory ***" > +mkdir empty_dir > +check_no_policy empty_dir > +$XFS_IO_PROG -c "set_encpolicy 0000111122223333" empty_dir > +$XFS_IO_PROG -c "get_encpolicy" empty_dir > + > +# Should be able to set the same policy again, but not a different one. > +# TODO: the error code for "already has a different policy" is planned to switch > +# from EINVAL to EEXIST. For now this test accepts both. > +echo -e "\n*** Setting encryption policy again ***" > +$XFS_IO_PROG -c "set_encpolicy 0000111122223333" empty_dir > +$XFS_IO_PROG -c "get_encpolicy" empty_dir > +$XFS_IO_PROG -c "set_encpolicy 4444555566667777" empty_dir |& \ > + sed -e 's/Invalid argument/File exists/' > +$XFS_IO_PROG -c "get_encpolicy" empty_dir > + > +# Should *not* be able to set an encryption policy on a nonempty directory > +echo -e "\n*** Setting encryption policy on nonempty directory ***" > +mkdir nonempty_dir > +touch nonempty_dir/file > +$XFS_IO_PROG -c "set_encpolicy" nonempty_dir > +check_no_policy nonempty_dir > + > +# Should *not* be able to set an encryption policy on a nondirectory file, even > +# an empty one. Regression test for 002ced4be642: "fscrypto: only allow setting > +# encryption policy on directories". > +# TODO: the error code for "not a directory" is planned to switch from EINVAL to > +# ENOTDIR. For now this test accepts both. > +echo -e "\n*** Setting encryption policy on nondirectory ***" > +touch nondirectory > +$XFS_IO_PROG -c "set_encpolicy" nondirectory |& \ > + sed -e 's/Invalid argument/Not a directory/' > +check_no_policy nondirectory > + > +# Should *not* be able to set an encryption policy on another user's directory. > +# Regression test for 163ae1c6ad62: "fscrypto: add authorization check for > +# setting encryption policy". > +echo -e "\n*** Setting encryption policy on another user's directory ***" > +mkdir unauthorized_dir > +su $qa_user -c "$XFS_IO_PROG -c \"set_encpolicy\" unauthorized_dir" > +check_no_policy unauthorized_dir > + > +# Should *not* be able to set an encryption policy on a directory on a > +# filesystem mounted readonly. Regression test for ba63f23d69a3: "fscrypto: > +# require write access to mount to set encryption policy". Test both a regular > +# readonly filesystem and a readonly bind mount of a read-write filesystem. > +echo -e "\n*** Setting encryption policy on readonly filesystem ***" > +mkdir ro_dir ro_bind_mnt > +_scratch_remount ro > +$XFS_IO_PROG -c "set_encpolicy" ro_dir > +check_no_policy ro_dir > +_scratch_remount rw > +mount --bind $SCRATCH_MNT ro_bind_mnt > +mount -o remount,ro ro_bind_mnt > +$XFS_IO_PROG -c "set_encpolicy" ro_bind_mnt/ro_dir > +check_no_policy ro_bind_mnt/ro_dir > +umount ro_bind_mnt > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/400.out b/tests/generic/400.out > new file mode 100644 > index 0000000..d187841 > --- /dev/null > +++ b/tests/generic/400.out > @@ -0,0 +1,43 @@ > +QA output created by 400 > + > +*** Setting encryption policy on empty directory *** > +empty_dir: failed to get encryption policy: No data available > +Encryption policy for empty_dir: > + Policy version: 0 > + Master key descriptor: 0000111122223333 > + Contents encryption mode: 1 (AES-256-XTS) > + Filenames encryption mode: 4 (AES-256-CTS) > + Flags: 0x02 > + > +*** Setting encryption policy again *** > +Encryption policy for empty_dir: > + Policy version: 0 > + Master key descriptor: 0000111122223333 > + Contents encryption mode: 1 (AES-256-XTS) > + Filenames encryption mode: 4 (AES-256-CTS) > + Flags: 0x02 > +empty_dir: failed to set encryption policy: File exists > +Encryption policy for empty_dir: > + Policy version: 0 > + Master key descriptor: 0000111122223333 > + Contents encryption mode: 1 (AES-256-XTS) > + Filenames encryption mode: 4 (AES-256-CTS) > + Flags: 0x02 > + > +*** Setting encryption policy on nonempty directory *** > +nonempty_dir: failed to set encryption policy: Directory not empty > +nonempty_dir: failed to get encryption policy: No data available > + > +*** Setting encryption policy on nondirectory *** > +nondirectory: failed to set encryption policy: Not a directory > +nondirectory: failed to get encryption policy: No data available > + > +*** Setting encryption policy on another user's directory *** > +unauthorized_dir: failed to set encryption policy: Permission denied > +unauthorized_dir: failed to get encryption policy: No data available > + > +*** Setting encryption policy on readonly filesystem *** > +ro_dir: failed to set encryption policy: Read-only file system > +ro_dir: failed to get encryption policy: No data available > +ro_bind_mnt/ro_dir: failed to set encryption policy: Read-only file system > +ro_bind_mnt/ro_dir: failed to get encryption policy: No data available > diff --git a/tests/generic/group b/tests/generic/group > index f4af986..e6619ca 100644 > --- a/tests/generic/group > +++ b/tests/generic/group > @@ -396,3 +396,4 @@ > 391 auto quick rw > 392 auto quick metadata > 393 auto quick rw > +400 auto quick encrypt > -- > 2.8.0.rc3.226.g39d4020 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html