Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39fa02a3 authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

crypto: talitos - check AES key size 



commit 1ba34e71e9e56ac29a52e0d42b6290f3dc5bfd90 upstream.

Although the HW accepts any size and silently truncates
it to the correct length, the extra tests expects EINVAL
to be returned when the key size is not valid.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Fixes: 4de9d0b5 ("crypto: talitos - Add ablkcipher algorithms")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1666bcb

drivers/crypto/talitos.c

+14 −0
Original line number Diff line number Diff line
@@ -1538,6 +1538,18 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, 
	return 0;

}



static int ablkcipher_aes_setkey(struct crypto_ablkcipher *cipher,

				  const u8 *key, unsigned int keylen)

{

	if (keylen == AES_KEYSIZE_128 || keylen == AES_KEYSIZE_192 ||

	    keylen == AES_KEYSIZE_256)

		return ablkcipher_setkey(cipher, key, keylen);



	crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);



	return -EINVAL;

}



static void common_nonsnoop_unmap(struct device *dev,

				  struct talitos_edesc *edesc,

				  struct ablkcipher_request *areq)
@@ -2705,6 +2717,7 @@ static struct talitos_alg_template driver_algs[] = { 
				.min_keysize = AES_MIN_KEY_SIZE,

				.max_keysize = AES_MAX_KEY_SIZE,

				.ivsize = AES_BLOCK_SIZE,

				.setkey = ablkcipher_aes_setkey,

			}

		},

		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
@@ -2722,6 +2735,7 @@ static struct talitos_alg_template driver_algs[] = { 
				.min_keysize = AES_MIN_KEY_SIZE,

				.max_keysize = AES_MAX_KEY_SIZE,

				.ivsize = AES_BLOCK_SIZE,

				.setkey = ablkcipher_aes_setkey,

			}

		},

		.desc_hdr_template = DESC_HDR_TYPE_AESU_CTR_NONSNOOP |