Skip to contentSkip to conversation

xfstests-bld: use old key prefix in ext4 encrypt config

PATCH Applied Eric Biggers 2 participants 2 messages Feb 6, 2017 – Feb 7, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests-bld: use old key prefix in ext4 encrypt config

From: Eric Biggers <[email protected]>

For the ext4 encrypt config, add the dummy key using the "ext4:" prefix instead of the "fscrypt:" prefix. This will allow xfstests-bld to test any old kernels to which the change to make test_dummy_encryption require a keyring key may get backported. (Of course, it also remains able to test old kernels to which that change has *not* been backported.) Using the old / fs-specific key prefix is also consistent with the xfstests in the "encrypt" group, which use the fs-specific key prefix to allow the tests to run unmodified on older kernels.

---
 kvm-xfstests/test-appliance/files/root/fs/ext4/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kvm-xfstests/test-appliance/files/root/fs/ext4/config +1 -1
index 86840e0..9fde22c 100644
@@ -46,7 +46,7 @@ function setup_mount_opts()
         fi
         local key="${mode}${raw}${size}"
         keyctl new_session
-        echo -n -e "${key}" | keyctl padd logon fscrypt:4242424242424242 @s
+        echo -n -e "${key}" | keyctl padd logon ext4:4242424242424242 @s
     fi
 }
 
Signature · 1 line
2.11.0.483.g087da7b7c-goog
#1 lore raw
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

For the ext4 encrypt config, add the dummy key using the "ext4:" prefix instead of the "fscrypt:" prefix. This will allow xfstests-bld to test any old kernels to which the change to make test_dummy_encryption require a keyring key may get backported. (Of course, it also remains able to test old kernels to which that change has *not* been backported.) Using the old / fs-specific key prefix is also consistent with the xfstests in the "encrypt" group, which use the fs-specific key prefix to allow the tests to run unmodified on older kernels.

Quoted 1 line

Thanks, applied.

- Ted