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

Commit a70c5225 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: ahash - Fix setkey crash 



When the alignment check was made unconditional for ahash we
may end up crashing on shash algorithms because we're always
calling alg->setkey instead of tfm->setkey.

This patch fixes it.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent faae8908

crypto/ahash.c

+2 −4
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ int crypto_hash_walk_first_compat(struct hash_desc *hdesc, 
static int ahash_setkey_unaligned(struct crypto_ahash *tfm, const u8 *key,

				unsigned int keylen)

{

	struct ahash_alg *ahash = crypto_ahash_alg(tfm);

	unsigned long alignmask = crypto_ahash_alignmask(tfm);

	int ret;

	u8 *buffer, *alignbuffer;
@@ -158,7 +157,7 @@ static int ahash_setkey_unaligned(struct crypto_ahash *tfm, const u8 *key, 


	alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	memcpy(alignbuffer, key, keylen);

	ret = ahash->setkey(tfm, alignbuffer, keylen);

	ret = tfm->setkey(tfm, alignbuffer, keylen);

	kzfree(buffer);

	return ret;

}
@@ -166,13 +165,12 @@ static int ahash_setkey_unaligned(struct crypto_ahash *tfm, const u8 *key, 
int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,

			unsigned int keylen)

{

	struct ahash_alg *ahash = crypto_ahash_alg(tfm);

	unsigned long alignmask = crypto_ahash_alignmask(tfm);



	if ((unsigned long)key & alignmask)

		return ahash_setkey_unaligned(tfm, key, keylen);



	return ahash->setkey(tfm, key, keylen);

	return tfm->setkey(tfm, key, keylen);

}

EXPORT_SYMBOL_GPL(crypto_ahash_setkey);