From 7400c10e503fed20fe2d9f8b03b2157eba4ff3b8 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 23 Mar 2017 12:16:08 -0700 Subject: [PATCH] ext4: test mounting filesystem with encrypted inode on orphan list Add an ext4-specific regression test for a bug which caused ext4 to crash when mounting a filesystem which had an encrypted inode on its orphan list. This bug was present in kernels v4.1 and later. It has been fixed in v4.11-rc1, v4.10.4, v4.9.16, and v4.4.55. Cc: Theodore Ts'o Cc: Michael Halcrow Signed-off-by: Eric Biggers Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/ext4/024 | 87 ++++++++++++++++++++++++++++++++++++++++++++++ tests/ext4/024.out | 2 ++ tests/ext4/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/ext4/024 create mode 100644 tests/ext4/024.out diff --git a/tests/ext4/024 b/tests/ext4/024 new file mode 100755 index 00000000..c0d26ac6 --- /dev/null +++ b/tests/ext4/024 @@ -0,0 +1,87 @@ +#! /bin/bash +# FS QA Test ext4/024 +# +# Regression test for 0d06863f903a ("ext4: don't BUG when truncating encrypted +# inodes on the orphan list"). +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Google, Inc. All Rights Reserved. +# +# Author: Eric Biggers +# +# 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 and checks +. ./common/rc +. ./common/encrypt + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs ext4 +_supported_os Linux +_require_scratch_encryption +_require_xfs_io_command "set_encpolicy" +_require_command "$KEYCTL_PROG" keyctl + +_new_session_keyring + +# +# Create an encrypted file whose size is not a multiple of the filesystem block +# size, then add it to the orphan list. +# +# We create the encrypted file normally, rather than use debugfs to force the +# inode flags to ENCRYPT|EXTENTS as done in the example listed in the commit +# message of the kernel fix, because forcing the inode flags is incompatible +# with some MKFS_OPTIONS such as inline_data or ^extents. +# +# This choice does, however, have the disadvantage that this test won't detect +# the bug in as many situations, such as in kernels configured without +# encryption support. +# +_scratch_mkfs_encrypted &>>$seqres.full +_scratch_mount +mkdir $SCRATCH_MNT/edir +keydesc=$(_generate_encryption_key) +$XFS_IO_PROG -c "set_encpolicy $keydesc" $SCRATCH_MNT/edir +echo foo > $SCRATCH_MNT/edir/file +inum=$(stat -c '%i' $SCRATCH_MNT/edir/file) +_scratch_unmount +debugfs -w -R "set_super_value s_last_orphan $inum" $SCRATCH_DEV &>>$seqres.full + +# Try to mount the filesystem. This would hit a BUG() in fs/ext4/inode.c. +_scratch_mount + +# success, all done +echo "Didn't crash!" +status=0 +exit diff --git a/tests/ext4/024.out b/tests/ext4/024.out new file mode 100644 index 00000000..b56c75ff --- /dev/null +++ b/tests/ext4/024.out @@ -0,0 +1,2 @@ +QA output created by 024 +Didn't crash! diff --git a/tests/ext4/group b/tests/ext4/group index 70d619e4..cac5aa5d 100644 --- a/tests/ext4/group +++ b/tests/ext4/group @@ -26,6 +26,7 @@ 021 auto quick 022 auto quick attr dangerous 023 auto quick scrub +024 auto quick encrypt dangerous 271 auto rw quick 301 aio auto ioctl rw stress defrag 302 aio auto ioctl rw stress defrag -- 2.34.1