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

Commit 1c2b4abb authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: talitos - don't bad_key in ablkcipher setkey 



crypto/ablkcipher.c's setkey() has already checked against the min, max
key sizes before it calls here, and all max_keysize assignments in the
algorithm template array do not exceed TALITOS_MAX_KEY_SIZE.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent febec542

drivers/crypto/talitos.c

+0 −11
Original line number Diff line number Diff line
@@ -1378,22 +1378,11 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, 
			     const u8 *key, unsigned int keylen)

{

	struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher);

	struct ablkcipher_alg *alg = crypto_ablkcipher_alg(cipher);



	if (keylen > TALITOS_MAX_KEY_SIZE)

		goto badkey;



	if (keylen < alg->min_keysize || keylen > alg->max_keysize)

		goto badkey;



	memcpy(&ctx->key, key, keylen);

	ctx->keylen = keylen;



	return 0;



badkey:

	crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);

	return -EINVAL;

}



static void common_nonsnoop_unmap(struct device *dev,