crypto: vmx - return correct error code on failed setkey

In the VMX implementations of AES and AES modes, return -EINVAL when an
invalid key length is provided, rather than some unusual error code
determined via a series of additions.  This makes the behavior match the
other AES implementations in the kernel's crypto API.

Cc: Daniel Axtens <dja@axtens.net>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/vmx/aes.c b/drivers/crypto/vmx/aes.c
index d7316f7a3a696177b1c5168e8226dccb2c912d40..b00d6947e02f4c5c283fe0d8cdd375754d8ef3df 100644 (file)
--- a/drivers/crypto/vmx/aes.c
+++ b/drivers/crypto/vmx/aes.c
@@ -78,13 +78,14 @@ static int p8_aes_setkey(struct crypto_tfm *tfm, const u8 *key,
        pagefault_disable();
        enable_kernel_vsx();
        ret = aes_p8_set_encrypt_key(key, keylen * 8, &ctx->enc_key);
-       ret += aes_p8_set_decrypt_key(key, keylen * 8, &ctx->dec_key);
+       ret |= aes_p8_set_decrypt_key(key, keylen * 8, &ctx->dec_key);
        disable_kernel_vsx();
        pagefault_enable();
        preempt_enable();
 
-       ret += crypto_cipher_setkey(ctx->fallback, key, keylen);
-       return ret;
+       ret |= crypto_cipher_setkey(ctx->fallback, key, keylen);
+
+       return ret ? -EINVAL : 0;
 }
 
 static void p8_aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)

diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c
index c5c5ff82b52e02b790311fd15a3120ef081fe0da..fbe882ef1bc5dd88be2ccce06d7e16912554bee0 100644 (file)
--- a/drivers/crypto/vmx/aes_cbc.c
+++ b/drivers/crypto/vmx/aes_cbc.c
@@ -81,13 +81,14 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,
        pagefault_disable();
        enable_kernel_vsx();
        ret = aes_p8_set_encrypt_key(key, keylen * 8, &ctx->enc_key);
-       ret += aes_p8_set_decrypt_key(key, keylen * 8, &ctx->dec_key);
+       ret |= aes_p8_set_decrypt_key(key, keylen * 8, &ctx->dec_key);
        disable_kernel_vsx();
        pagefault_enable();
        preempt_enable();
 
-       ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
-       return ret;
+       ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
+
+       return ret ? -EINVAL : 0;
 }
 
 static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,

diff --git a/drivers/crypto/vmx/aes_ctr.c b/drivers/crypto/vmx/aes_ctr.c
index 8a2fe092cb8e03df51a68aab154b9fd6664e4593..214c69db9ebdf8cdeaf033596f040065ea87d51c 100644 (file)
--- a/drivers/crypto/vmx/aes_ctr.c
+++ b/drivers/crypto/vmx/aes_ctr.c
@@ -83,8 +83,9 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,
        pagefault_enable();
        preempt_enable();
 
-       ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
-       return ret;
+       ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
+
+       return ret ? -EINVAL : 0;
 }
 
 static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx,

diff --git a/drivers/crypto/vmx/aes_xts.c b/drivers/crypto/vmx/aes_xts.c
index ecd64e5cc5bbb473880855f9488ff4da1c8d271e..5bf4c3856650211bc396708d7946421551794b2f 100644 (file)
--- a/drivers/crypto/vmx/aes_xts.c
+++ b/drivers/crypto/vmx/aes_xts.c
@@ -86,14 +86,15 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key,
        pagefault_disable();
        enable_kernel_vsx();
        ret = aes_p8_set_encrypt_key(key + keylen/2, (keylen/2) * 8, &ctx->tweak_key);
-       ret += aes_p8_set_encrypt_key(key, (keylen/2) * 8, &ctx->enc_key);
-       ret += aes_p8_set_decrypt_key(key, (keylen/2) * 8, &ctx->dec_key);
+       ret |= aes_p8_set_encrypt_key(key, (keylen/2) * 8, &ctx->enc_key);
+       ret |= aes_p8_set_decrypt_key(key, (keylen/2) * 8, &ctx->dec_key);
        disable_kernel_vsx();
        pagefault_enable();
        preempt_enable();
 
-       ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
-       return ret;
+       ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
+
+       return ret ? -EINVAL : 0;
 }
 
 static int p8_aes_xts_crypt(struct blkcipher_desc *desc,