| Message ID | 20170130213647.14843-1-ebiggers3@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jan 30, 2017 at 01:36:47PM -0800, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > We can improve test coverage and simplify the test_dummy_encryption > kernel logic by requiring userspace to add a default master key to the > keyring. Update xfstests-bld to do this. This allows xfstests-bld to > test kernels with the corresponding kernel patch applied ("fscrypt: make > test_dummy_encryption require a keyring key"). It can still test older > kernels too; the key just doesn't get used in that case. > > Signed-off-by: Eric Biggers <ebiggers@google.com> This is upstream already. (commit: ce7ef24b3ef1940) - Ted -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 30, 2017 at 05:42:38PM -0500, Theodore Ts'o wrote: > On Mon, Jan 30, 2017 at 01:36:47PM -0800, Eric Biggers wrote: > > From: Eric Biggers <ebiggers@google.com> > > > > We can improve test coverage and simplify the test_dummy_encryption > > kernel logic by requiring userspace to add a default master key to the > > keyring. Update xfstests-bld to do this. This allows xfstests-bld to > > test kernels with the corresponding kernel patch applied ("fscrypt: make > > test_dummy_encryption require a keyring key"). It can still test older > > kernels too; the key just doesn't get used in that case. > > > > Signed-off-by: Eric Biggers <ebiggers@google.com> > > This is upstream already. (commit: ce7ef24b3ef1940) > > - Ted I don't see it. Can you push out what you have, to both the kernel.org and github repositories? Eric -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 30, 2017 at 03:03:52PM -0800, Eric Biggers wrote: > On Mon, Jan 30, 2017 at 05:42:38PM -0500, Theodore Ts'o wrote: > > On Mon, Jan 30, 2017 at 01:36:47PM -0800, Eric Biggers wrote: > > > From: Eric Biggers <ebiggers@google.com> > > > > > > We can improve test coverage and simplify the test_dummy_encryption > > > kernel logic by requiring userspace to add a default master key to the > > > keyring. Update xfstests-bld to do this. This allows xfstests-bld to > > > test kernels with the corresponding kernel patch applied ("fscrypt: make > > > test_dummy_encryption require a keyring key"). It can still test older > > > kernels too; the key just doesn't get used in that case. > > > > > > Signed-off-by: Eric Biggers <ebiggers@google.com> > > > > This is upstream already. (commit: ce7ef24b3ef1940) > > > > - Ted > > I don't see it. Can you push out what you have, to both the kernel.org and > github repositories? Done. (I thought I had, but looks like I had only pushed it out to github somehow). - Ted -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/config b/kvm-xfstests/test-appliance/files/root/fs/ext4/config index 66d2633..23e869c 100644 --- a/kvm-xfstests/test-appliance/files/root/fs/ext4/config +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/config @@ -36,6 +36,19 @@ function setup_mount_opts() if test -n "$MNTOPTS" ; then EXT_MOUNT_OPTIONS="$EXT_MOUNT_OPTIONS,$MNTOPTS" fi + if echo "$EXT_MOUNT_OPTIONS" | grep -q test_dummy_encryption; then + # Create a new session keyring and add a default master key to it. + keyctl new_session > /dev/null + local mode='\x00\x00\x00\x00' + local raw="$(printf '\\x%02x' $(seq 0 63))" + if lscpu | grep -q '^Byte Order:[[:space:]]\+Little Endian$'; then + local size='\x40\x00\x00\x00' + else + local size='\x00\x00\x00\x40' + fi + echo -n -e "${mode}${raw}${size}" | \ + keyctl padd logon ext4:4242424242424242 @s > /dev/null + fi } function get_mkfs_opts()