Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: adiantum - fix leaking reference to hash algorithm

Browse Source 
crypto_alg_mod_lookup() takes a reference to the hash algorithm but
crypto_init_shash_spawn() doesn't take ownership of it, hence the
reference needs to be dropped in adiantum_create().

Fixes: 059c2a4d8e ("crypto: adiantum - add Adiantum support")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2018-12-10 11:45:58 -08:00 committed by Herbert Xu
parent 0ac6b8fb23
commit 00c9fe37a7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/adiantum.c
View File

@ -564,10 +564,8 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
hash_alg = __crypto_shash_alg(_hash_alg); hash_alg = __crypto_shash_alg(_hash_alg);
err = crypto_init_shash_spawn(&ictx->hash_spawn, hash_alg, err = crypto_init_shash_spawn(&ictx->hash_spawn, hash_alg,
skcipher_crypto_instance(inst)); skcipher_crypto_instance(inst));
if (err) { if (err)
crypto_mod_put(_hash_alg); goto out_put_hash;
goto out_drop_blockcipher;
}
/* Check the set of algorithms */ /* Check the set of algorithms */
if (!adiantum_supported_algorithms(streamcipher_alg, blockcipher_alg, if (!adiantum_supported_algorithms(streamcipher_alg, blockcipher_alg,
@ -624,10 +622,13 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
if (err) if (err)
goto out_drop_hash; goto out_drop_hash;
crypto_mod_put(_hash_alg);
return 0; return 0;
out_drop_hash: out_drop_hash:
crypto_drop_shash(&ictx->hash_spawn); crypto_drop_shash(&ictx->hash_spawn);
out_put_hash:
crypto_mod_put(_hash_alg);
out_drop_blockcipher: out_drop_blockcipher:
crypto_drop_spawn(&ictx->blockcipher_spawn); crypto_drop_spawn(&ictx->blockcipher_spawn);
out_drop_streamcipher: out_drop_streamcipher: