]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: cavium - Fix an error handling path in cpt_ucode_load_fw()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Fri, 8 Nov 2024 17:22:27 +0000 (18:22 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:47:45 +0000 (19:47 +0100)
[ Upstream commit 572b7cf08403b6c67dfe0dc3e0f2efb42443254f ]

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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/crypto/cavium/cpt/cptpf_main.c

index b3db27b142afba37543aafabe2143b9cf16e68e6..52101755d0ddf403d10ed0265785d09a87d768c0 100644 (file)
@@ -303,6 +303,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;
        }