crypto: xts - consolidate sanity check for keys

The patch centralizes the XTS key check logic into the service function
xts_check_key which is invoked from the different XTS implementations.
With this, the XTS implementations in ARM, ARM64, PPC and S390 have now
a sanity check for the XTS keys similar to the other arches.

In addition, this service function received a check to ensure that the
key != the tweak key which is mandated by FIPS 140-2 IG A.9. As the
check is not present in the standards defining XTS, it is only enforced
in FIPS mode of the kernel.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

6 files changed, 18 insertions, 45 deletions

diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 3633ad6145c5..064c7e2bd7c8 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -639,16 +639,11 @@ static int xts_aesni_setkey(struct crypto_tfm *tfm, const u8 *key,
                             unsigned int keylen)
 {
         struct aesni_xts_ctx *ctx = crypto_tfm_ctx(tfm);
-        u32 *flags = &tfm->crt_flags;
         int err;
 
-        /* key consists of keys of equal size concatenated, therefore
-         * the length must be even
-         */
-        if (keylen % 2) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                return -EINVAL;
-        }
+        err = xts_check_key(tfm, key, keylen);
+        if (err)
+                return err;
 
         /* first half of xts-key is for crypt */
         err = aes_set_key_common(tfm, ctx->raw_crypt_ctx, key, keylen / 2);
diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c
index 5c8b6266a394..aa76cad9d262 100644
--- a/arch/x86/crypto/camellia_glue.c
+++ b/arch/x86/crypto/camellia_glue.c
@@ -1503,13 +1503,9 @@ int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,
         u32 *flags = &tfm->crt_flags;
         int err;
 
-        /* key consists of keys of equal size concatenated, therefore
-         * the length must be even
-         */
-        if (keylen % 2) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                return -EINVAL;
-        }
+        err = xts_check_key(tfm, key, keylen);
+        if (err)
+                return err;
 
         /* first half of xts-key is for crypt */
         err = __camellia_setkey(&ctx->crypt_ctx, key, keylen / 2, flags);
diff --git a/arch/x86/crypto/cast6_avx_glue.c b/arch/x86/crypto/cast6_avx_glue.c
index fca459578c35..50e684768c55 100644
--- a/arch/x86/crypto/cast6_avx_glue.c
+++ b/arch/x86/crypto/cast6_avx_glue.c
@@ -329,13 +329,9 @@ static int xts_cast6_setkey(struct crypto_tfm *tfm, const u8 *key,
         u32 *flags = &tfm->crt_flags;
         int err;
 
-        /* key consists of keys of equal size concatenated, therefore
-         * the length must be even
-         */
-        if (keylen % 2) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                return -EINVAL;
-        }
+        err = xts_check_key(tfm, key, keylen);
+        if (err)
+                return err;
 
         /* first half of xts-key is for crypt */
         err = __cast6_setkey(&ctx->crypt_ctx, key, keylen / 2, flags);
diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c
index 5dc37026c7ce..6f778d3daa22 100644
--- a/arch/x86/crypto/serpent_avx_glue.c
+++ b/arch/x86/crypto/serpent_avx_glue.c
@@ -332,16 +332,11 @@ int xts_serpent_setkey(struct crypto_tfm *tfm, const u8 *key,
                        unsigned int keylen)
 {
         struct serpent_xts_ctx *ctx = crypto_tfm_ctx(tfm);
-        u32 *flags = &tfm->crt_flags;
         int err;
 
-        /* key consists of keys of equal size concatenated, therefore
-         * the length must be even
-         */
-        if (keylen % 2) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                return -EINVAL;
-        }
+        err = xts_check_key(tfm, key, keylen);
+        if (err)
+                return err;
 
         /* first half of xts-key is for crypt */
         err = __serpent_setkey(&ctx->crypt_ctx, key, keylen / 2);
diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c
index 3643dd508f45..8943407e8917 100644
--- a/arch/x86/crypto/serpent_sse2_glue.c
+++ b/arch/x86/crypto/serpent_sse2_glue.c
@@ -309,16 +309,11 @@ static int xts_serpent_setkey(struct crypto_tfm *tfm, const u8 *key,
                               unsigned int keylen)
 {
         struct serpent_xts_ctx *ctx = crypto_tfm_ctx(tfm);
-        u32 *flags = &tfm->crt_flags;
         int err;
 
-        /* key consists of keys of equal size concatenated, therefore
-         * the length must be even
-         */
-        if (keylen % 2) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                return -EINVAL;
-        }
+        err = xts_check_key(tfm, key, keylen);
+        if (err)
+                return err;
 
         /* first half of xts-key is for crypt */
         err = __serpent_setkey(&ctx->crypt_ctx, key, keylen / 2);
diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c
index 56d8a08ee479..2ebb5e9789f3 100644
--- a/arch/x86/crypto/twofish_glue_3way.c
+++ b/arch/x86/crypto/twofish_glue_3way.c
@@ -277,13 +277,9 @@ int xts_twofish_setkey(struct crypto_tfm *tfm, const u8 *key,
         u32 *flags = &tfm->crt_flags;
         int err;
 
-        /* key consists of keys of equal size concatenated, therefore
-         * the length must be even
-         */
-        if (keylen % 2) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                return -EINVAL;
-        }
+        err = xts_check_key(tfm, key, keylen);
+        if (err)
+                return err;
 
         /* first half of xts-key is for crypt */
         err = __twofish_setkey(&ctx->crypt_ctx, key, keylen / 2, flags);