]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
crypto: adiantum - fix leaking reference to hash algorithm
authorEric Biggers <ebiggers@google.com>
Mon, 10 Dec 2018 19:45:58 +0000 (11:45 -0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 13 Dec 2018 10:24:59 +0000 (18:24 +0800)
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: 059c2a4d8e16 ("crypto: adiantum - add Adiantum support")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/adiantum.c

index e62e34f5e389b923f0c72c81c42142563a719962..6651e713c45d6b2e3af4955cdecde6c671a2c874 100644 (file)
@@ -564,10 +564,8 @@ static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
        hash_alg = __crypto_shash_alg(_hash_alg);
        err = crypto_init_shash_spawn(&ictx->hash_spawn, hash_alg,
                                      skcipher_crypto_instance(inst));
-       if (err) {
-               crypto_mod_put(_hash_alg);
-               goto out_drop_blockcipher;
-       }
+       if (err)
+               goto out_put_hash;
 
        /* Check the set of algorithms */
        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)
                goto out_drop_hash;
 
+       crypto_mod_put(_hash_alg);
        return 0;
 
 out_drop_hash:
        crypto_drop_shash(&ictx->hash_spawn);
+out_put_hash:
+       crypto_mod_put(_hash_alg);
 out_drop_blockcipher:
        crypto_drop_spawn(&ictx->blockcipher_spawn);
 out_drop_streamcipher: