* [PATCH] crypto: hmac - fix memory leak in hmac_init_tfm()
@ 2019-05-22 19:42 Eric Biggers
2019-05-30 13:42 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2019-05-22 19:42 UTC (permalink / raw)
To: linux-crypto, Herbert Xu
From: Eric Biggers <ebiggers@google.com>
When I added the sanity check of 'descsize', I missed that the child
hash tfm needs to be freed if the sanity check fails. Of course this
should never happen, hence the use of WARN_ON(), but it should be fixed.
Fixes: e1354400b25d ("crypto: hash - fix incorrect HASH_MAX_DESCSIZE")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/hmac.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/crypto/hmac.c b/crypto/hmac.c
index 241b1868c1d01..ac8c611ee33e4 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -157,8 +157,10 @@ static int hmac_init_tfm(struct crypto_tfm *tfm)
parent->descsize = sizeof(struct shash_desc) +
crypto_shash_descsize(hash);
- if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE))
+ if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) {
+ crypto_free_shash(hash);
return -EINVAL;
+ }
ctx->hash = hash;
return 0;
--
2.22.0.rc1.257.g3120a18244-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] crypto: hmac - fix memory leak in hmac_init_tfm()
2019-05-22 19:42 [PATCH] crypto: hmac - fix memory leak in hmac_init_tfm() Eric Biggers
@ 2019-05-30 13:42 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2019-05-30 13:42 UTC (permalink / raw)
To: Eric Biggers; +Cc: linux-crypto
On Wed, May 22, 2019 at 12:42:29PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> When I added the sanity check of 'descsize', I missed that the child
> hash tfm needs to be freed if the sanity check fails. Of course this
> should never happen, hence the use of WARN_ON(), but it should be fixed.
>
> Fixes: e1354400b25d ("crypto: hash - fix incorrect HASH_MAX_DESCSIZE")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> crypto/hmac.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-30 13:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22 19:42 [PATCH] crypto: hmac - fix memory leak in hmac_init_tfm() Eric Biggers
2019-05-30 13:42 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).