From 7f242b18a125a96d7375c3c7582eb15ee6b5413c Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 27 Dec 2016 19:46:27 -0500 Subject: [PATCH] fscrypt: fix the test_dummy_encryption mount option Commit 2375da2442e6b: "crypto: xts - Convert to skcipher" now fails the setkey operation if the AES key is the same as the tweak key. Previously this check was only done if FIPS mode is enabled. Now this check is also done if weak key checking was requested. This is reasonable, but since we were using the dummy key which was a constant series of 0x42 bytes, it now caused dummy encrpyption test mode to fail. Fix this by using 0x42... and 0x24... for the two keys, so they are different. Fixes: 2375da2442e6bb472e33406a54fa8f09f091956a Cc: stable@vger.kernel.org Signed-off-by: Theodore Ts'o --- fs/crypto/keyinfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 6eeea1dcba41c..95cd4c3b06c32 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -248,7 +248,8 @@ retry: goto out; if (fscrypt_dummy_context_enabled(inode)) { - memset(raw_key, 0x42, FS_AES_256_XTS_KEY_SIZE); + memset(raw_key, 0x42, keysize/2); + memset(raw_key+keysize/2, 0x24, keysize - (keysize/2)); goto got_key; } -- 2.39.5