* [PATCH v3] cypto: mediatek - fix leaks in mtk_desc_ring_alloc
@ 2020-09-11 1:36 Xiaoliang Pang
2020-09-11 3:26 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Xiaoliang Pang @ 2020-09-11 1:36 UTC (permalink / raw)
To: herbert, davem, matthias.bgg, swboyd, yuehaibing, tianjia.zhang,
ryder.lee
Cc: linux-crypto, linux-arm-kernel, linux-mediatek, linux-kernel,
dawning.pang
In the init loop, if an error occurs in function 'dma_alloc_coherent',
then goto the err_cleanup section,
in the cleanup loop, after run i--,
the struct mtk_ring rising[i] will not be released,
causing a memory leak
Signed-off-by: Xiaoliang Pang <dawning.pang@gmail.com>
---
drivers/crypto/mediatek/mtk-platform.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/mediatek/mtk-platform.c b/drivers/crypto/mediatek/mtk-platform.c
index 7e3ad085b5bd..ebb3bdef0dbe 100644
--- a/drivers/crypto/mediatek/mtk-platform.c
+++ b/drivers/crypto/mediatek/mtk-platform.c
@@ -469,13 +469,13 @@ static int mtk_desc_ring_alloc(struct mtk_cryp *cryp)
return 0;
err_cleanup:
- for (; i--; ) {
+ do {
dma_free_coherent(cryp->dev, MTK_DESC_RING_SZ,
ring[i]->res_base, ring[i]->res_dma);
dma_free_coherent(cryp->dev, MTK_DESC_RING_SZ,
ring[i]->cmd_base, ring[i]->cmd_dma);
kfree(ring[i]);
- }
+ }while(i--);
return err;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3] cypto: mediatek - fix leaks in mtk_desc_ring_alloc
2020-09-11 1:36 [PATCH v3] cypto: mediatek - fix leaks in mtk_desc_ring_alloc Xiaoliang Pang
@ 2020-09-11 3:26 ` Herbert Xu
0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2020-09-11 3:26 UTC (permalink / raw)
To: Xiaoliang Pang
Cc: davem, matthias.bgg, swboyd, yuehaibing, tianjia.zhang, ryder.lee,
linux-crypto, linux-arm-kernel, linux-mediatek, linux-kernel
On Fri, Sep 11, 2020 at 09:36:19AM +0800, Xiaoliang Pang wrote:
>
> diff --git a/drivers/crypto/mediatek/mtk-platform.c b/drivers/crypto/mediatek/mtk-platform.c
> index 7e3ad085b5bd..ebb3bdef0dbe 100644
> --- a/drivers/crypto/mediatek/mtk-platform.c
> +++ b/drivers/crypto/mediatek/mtk-platform.c
> @@ -469,13 +469,13 @@ static int mtk_desc_ring_alloc(struct mtk_cryp *cryp)
> return 0;
>
> err_cleanup:
> - for (; i--; ) {
> + do {
> dma_free_coherent(cryp->dev, MTK_DESC_RING_SZ,
> ring[i]->res_base, ring[i]->res_dma);
> dma_free_coherent(cryp->dev, MTK_DESC_RING_SZ,
> ring[i]->cmd_base, ring[i]->cmd_dma);
> kfree(ring[i]);
> - }
> + }while(i--);
Please add spaces before and after while.
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] 3+ messages in thread
* [PATCH v3] cypto: mediatek - fix leaks in mtk_desc_ring_alloc
@ 2020-09-07 2:09 Xiaoliang Pang
0 siblings, 0 replies; 3+ messages in thread
From: Xiaoliang Pang @ 2020-09-07 2:09 UTC (permalink / raw)
To: herbert, davem, matthias.bgg, swboyd, yuehaibing, tianjia.zhang,
ryder.lee
Cc: linux-crypto, linux-arm-kernel, linux-mediatek, linux-kernel,
dawning.pang
In the init loop, if an error occurs in function 'dma_alloc_coherent',
then goto the err_cleanup section,
in the cleanup loop, after run i--,
the struct mtk_ring rising[i] will not be released,
causing a memory leak
Signed-off-by: Xiaoliang Pang <dawning.pang@gmail.com>
---
drivers/crypto/mediatek/mtk-platform.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/mediatek/mtk-platform.c b/drivers/crypto/mediatek/mtk-platform.c
index 7e3ad085b5bd..ebb3bdef0dbe 100644
--- a/drivers/crypto/mediatek/mtk-platform.c
+++ b/drivers/crypto/mediatek/mtk-platform.c
@@ -469,13 +469,13 @@ static int mtk_desc_ring_alloc(struct mtk_cryp *cryp)
return 0;
err_cleanup:
- for (; i--; ) {
+ do {
dma_free_coherent(cryp->dev, MTK_DESC_RING_SZ,
ring[i]->res_base, ring[i]->res_dma);
dma_free_coherent(cryp->dev, MTK_DESC_RING_SZ,
ring[i]->cmd_base, ring[i]->cmd_dma);
kfree(ring[i]);
- }
+ }while(i--);
return err;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-11 3:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-11 1:36 [PATCH v3] cypto: mediatek - fix leaks in mtk_desc_ring_alloc Xiaoliang Pang
2020-09-11 3:26 ` Herbert Xu
-- strict thread matches above, loose matches on Subject: below --
2020-09-07 2:09 Xiaoliang Pang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox