crypto: cavium - Fix an error handling path in cpt_ucode_load_fw()

[PATCH] crypto: cavium - Fix an error handling path in cpt_ucode_load_fw()

Posted by Christophe JAILLET 2 weeks, 1 day ago

If do_cpt_init() fails, a previous dma_alloc_coherent() call needs to be
undone.

Add the needed dma_free_coherent() before returning.

Fixes: 9e2c7d99941d ("crypto: cavium - Add Support for Octeon-tx CPT Engine")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only.

I guess that dmam_alloc_coherent() could also be used to fix the leak.
This would simplify cpt_unload_microcode(), IIUC.
---
 drivers/crypto/cavium/cpt/cptpf_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/crypto/cavium/cpt/cptpf_main.c b/drivers/crypto/cavium/cpt/cptpf_main.c
index ec17beee24c0..54de869e5374 100644
--- a/drivers/crypto/cavium/cpt/cptpf_main.c
+++ b/drivers/crypto/cavium/cpt/cptpf_main.c
@@ -302,6 +302,8 @@ static int cpt_ucode_load_fw(struct cpt_device *cpt, const u8 *fw, bool is_ae)
 
 	ret = do_cpt_init(cpt, mcode);
 	if (ret) {
+		dma_free_coherent(&cpt->pdev->dev, mcode->code_size,
+				  mcode->code, mcode->phys_base);
 		dev_err(dev, "do_cpt_init failed with ret: %d\n", ret);
 		goto fw_release;
 	}
-- 
2.47.0

Re: [PATCH] crypto: cavium - Fix an error handling path in cpt_ucode_load_fw()

Posted by Herbert Xu 1 week, 1 day ago

On Fri, Nov 08, 2024 at 06:22:27PM +0100, Christophe JAILLET wrote:
> If do_cpt_init() fails, a previous dma_alloc_coherent() call needs to be
> undone.
> 
> Add the needed dma_free_coherent() before returning.
> 
> Fixes: 9e2c7d99941d ("crypto: cavium - Add Support for Octeon-tx CPT Engine")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only.
> 
> I guess that dmam_alloc_coherent() could also be used to fix the leak.
> This would simplify cpt_unload_microcode(), IIUC.
> ---
>  drivers/crypto/cavium/cpt/cptpf_main.c | 2 ++
>  1 file changed, 2 insertions(+)

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