* [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map
@ 2021-03-02 16:34 Colin King
2021-03-02 16:40 ` Corentin Labbe
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Colin King @ 2021-03-02 16:34 UTC (permalink / raw)
To: Corentin Labbe, Herbert Xu, David S . Miller, Maxime Ripard,
Chen-Yu Tsai, Jernej Skrabec, linux-crypto, linux-arm-kernel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
In the case where the dma_iv mapping fails, the return error path leaks
the memory allocated to object d. Fix this by adding a new error return
label and jumping to this to ensure d is free'd before the return.
Addresses-Coverity: ("Resource leak")
Fixes: ac2614d721de ("crypto: sun8i-ss - Add support for the PRNG")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
index 08a1473b2145..3191527928e4 100644
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
@@ -103,7 +103,8 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
dma_iv = dma_map_single(ss->dev, ctx->seed, ctx->slen, DMA_TO_DEVICE);
if (dma_mapping_error(ss->dev, dma_iv)) {
dev_err(ss->dev, "Cannot DMA MAP IV\n");
- return -EFAULT;
+ err = -EFAULT;
+ goto err_free;
}
dma_dst = dma_map_single(ss->dev, d, todo, DMA_FROM_DEVICE);
@@ -167,6 +168,7 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
memcpy(ctx->seed, d + dlen, ctx->slen);
}
memzero_explicit(d, todo);
+err_free:
kfree(d);
return err;
--
2.30.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map
2021-03-02 16:34 [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map Colin King
@ 2021-03-02 16:40 ` Corentin Labbe
2021-03-09 6:45 ` Corentin Labbe
2021-03-12 13:12 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Corentin Labbe @ 2021-03-02 16:40 UTC (permalink / raw)
To: Colin King
Cc: Herbert Xu, David S . Miller, Maxime Ripard, Chen-Yu Tsai,
Jernej Skrabec, linux-crypto, linux-arm-kernel, kernel-janitors,
linux-kernel
Le Tue, Mar 02, 2021 at 04:34:46PM +0000, Colin King a écrit :
> From: Colin Ian King <colin.king@canonical.com>
>
> In the case where the dma_iv mapping fails, the return error path leaks
> the memory allocated to object d. Fix this by adding a new error return
> label and jumping to this to ensure d is free'd before the return.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: ac2614d721de ("crypto: sun8i-ss - Add support for the PRNG")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map
2021-03-02 16:34 [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map Colin King
2021-03-02 16:40 ` Corentin Labbe
@ 2021-03-09 6:45 ` Corentin Labbe
2021-03-12 13:12 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Corentin Labbe @ 2021-03-09 6:45 UTC (permalink / raw)
To: Colin King
Cc: Herbert Xu, David S . Miller, Maxime Ripard, Chen-Yu Tsai,
Jernej Skrabec, linux-crypto, linux-arm-kernel, kernel-janitors,
linux-kernel
Le Tue, Mar 02, 2021 at 04:34:46PM +0000, Colin King a écrit :
> From: Colin Ian King <colin.king@canonical.com>
>
> In the case where the dma_iv mapping fails, the return error path leaks
> the memory allocated to object d. Fix this by adding a new error return
> label and jumping to this to ensure d is free'd before the return.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: ac2614d721de ("crypto: sun8i-ss - Add support for the PRNG")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
> index 08a1473b2145..3191527928e4 100644
> --- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
> +++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
> @@ -103,7 +103,8 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
> dma_iv = dma_map_single(ss->dev, ctx->seed, ctx->slen, DMA_TO_DEVICE);
> if (dma_mapping_error(ss->dev, dma_iv)) {
> dev_err(ss->dev, "Cannot DMA MAP IV\n");
> - return -EFAULT;
> + err = -EFAULT;
> + goto err_free;
> }
>
> dma_dst = dma_map_single(ss->dev, d, todo, DMA_FROM_DEVICE);
> @@ -167,6 +168,7 @@ int sun8i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
> memcpy(ctx->seed, d + dlen, ctx->slen);
> }
> memzero_explicit(d, todo);
> +err_free:
> kfree(d);
>
> return err;
> --
> 2.30.0
>
Hello
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map
2021-03-02 16:34 [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map Colin King
2021-03-02 16:40 ` Corentin Labbe
2021-03-09 6:45 ` Corentin Labbe
@ 2021-03-12 13:12 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2021-03-12 13:12 UTC (permalink / raw)
To: Colin King
Cc: Corentin Labbe, David S . Miller, Maxime Ripard, Chen-Yu Tsai,
Jernej Skrabec, linux-crypto, linux-arm-kernel, kernel-janitors,
linux-kernel
On Tue, Mar 02, 2021 at 04:34:46PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> In the case where the dma_iv mapping fails, the return error path leaks
> the memory allocated to object d. Fix this by adding a new error return
> label and jumping to this to ensure d is free'd before the return.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: ac2614d721de ("crypto: sun8i-ss - Add support for the PRNG")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.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] 4+ messages in thread
end of thread, other threads:[~2021-03-12 13:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 16:34 [PATCH] crypto: sun8i-ss: Fix memory leak of object d when dma_iv fails to map Colin King
2021-03-02 16:40 ` Corentin Labbe
2021-03-09 6:45 ` Corentin Labbe
2021-03-12 13:12 ` 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).