Commit 694e0db6 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4a8108b7
...@@ -78,13 +78,14 @@ static int p8_aes_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -78,13 +78,14 @@ static int p8_aes_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); enable_kernel_vsx();
ret = aes_p8_set_encrypt_key(key, keylen * 8, &ctx->enc_key); 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(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_cipher_setkey(ctx->fallback, key, keylen); ret |= crypto_cipher_setkey(ctx->fallback, key, keylen);
return ret;
return ret ? -EINVAL : 0;
} }
static void p8_aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) static void p8_aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
......
...@@ -81,13 +81,14 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -81,13 +81,14 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); enable_kernel_vsx();
ret = aes_p8_set_encrypt_key(key, keylen * 8, &ctx->enc_key); 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(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen); ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
return ret;
return ret ? -EINVAL : 0;
} }
static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,
......
...@@ -83,8 +83,9 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -83,8 +83,9 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen); ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
return ret;
return ret ? -EINVAL : 0;
} }
static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx, static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx,
......
...@@ -86,14 +86,15 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -86,14 +86,15 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); 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, (keylen/2) * 8, &ctx->tweak_key);
ret += aes_p8_set_encrypt_key(key, (keylen/2) * 8, &ctx->enc_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_decrypt_key(key, (keylen/2) * 8, &ctx->dec_key);
disable_kernel_vsx(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret += crypto_sync_skcipher_setkey(ctx->fallback, key, keylen); ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen);
return ret;
return ret ? -EINVAL : 0;
} }
static int p8_aes_xts_crypt(struct blkcipher_desc *desc, static int p8_aes_xts_crypt(struct blkcipher_desc *desc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment