Commit d50b35f0 authored by Chang S. Bae's avatar Chang S. Bae Committed by Herbert Xu
Browse files

crypto: x86/aesni - Rearrange AES key size check 



aes_expandkey() already includes an AES key size check. If AES-NI is
unusable, invoke the function without the size check.

Also, use aes_check_keylen() instead of open code.

Signed-off-by: default avatarChang S. Bae <chang.seok.bae@intel.com>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: linux-crypto@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2b3460cb

arch/x86/crypto/aesni-intel_glue.c

+8 −10
Original line number Diff line number Diff line
@@ -233,18 +233,16 @@ static int aes_set_key_common(struct crypto_aes_ctx *ctx, 
{

	int err;



	if (key_len != AES_KEYSIZE_128 && key_len != AES_KEYSIZE_192 &&

	    key_len != AES_KEYSIZE_256)

		return -EINVAL;



	if (!crypto_simd_usable())

		err = aes_expandkey(ctx, in_key, key_len);

	else {

		return aes_expandkey(ctx, in_key, key_len);



	err = aes_check_keylen(key_len);

	if (err)

		return err;



	kernel_fpu_begin();

	err = aesni_set_key(ctx, in_key, key_len);

	kernel_fpu_end();

	}



	return err;

}