crypto: sa2ul - Fix leaks on failure paths with sa_dma_init()

[ Upstream commit 4c0716ee1d973f6504d13f0e8d4d10350c85ad37 ]

The sa_dma_init() function doesn't release the requested dma channels
on all failure paths. Any failure in this function also ends up
leaking the dma pool created in sa_init_mem() in the sa_ul_probe()
function. Fix all of these issues.

Fixes: 7694b6ca649f ("crypto: sa2ul - Add crypto driver")
Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Tero Kristo <kristo@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/crypto/sa2ul.c b/drivers/crypto/sa2ul.c
index b0f0502a5bb0f3516269248e16f60a9f5659be23..efde3e96f62dcc4417a1055fb056c7a2eb4837f1 100644 (file)
--- a/drivers/crypto/sa2ul.c
+++ b/drivers/crypto/sa2ul.c
@@ -2275,9 +2275,9 @@ static int sa_dma_init(struct sa_crypto_data *dd)
 
        dd->dma_rx2 = dma_request_chan(dd->dev, "rx2");
        if (IS_ERR(dd->dma_rx2)) {
-               dma_release_channel(dd->dma_rx1);
-               return dev_err_probe(dd->dev, PTR_ERR(dd->dma_rx2),
-                                    "Unable to request rx2 DMA channel\n");
+               ret = dev_err_probe(dd->dev, PTR_ERR(dd->dma_rx2),
+                                   "Unable to request rx2 DMA channel\n");
+               goto err_dma_rx2;
        }
 
        dd->dma_tx = dma_request_chan(dd->dev, "tx");
@@ -2298,28 +2298,31 @@ static int sa_dma_init(struct sa_crypto_data *dd)
        if (ret) {
                dev_err(dd->dev, "can't configure IN dmaengine slave: %d\n",
                        ret);
-               return ret;
+               goto err_dma_config;
        }
 
        ret = dmaengine_slave_config(dd->dma_rx2, &cfg);
        if (ret) {
                dev_err(dd->dev, "can't configure IN dmaengine slave: %d\n",
                        ret);
-               return ret;
+               goto err_dma_config;
        }
 
        ret = dmaengine_slave_config(dd->dma_tx, &cfg);
        if (ret) {
                dev_err(dd->dev, "can't configure OUT dmaengine slave: %d\n",
                        ret);
-               return ret;
+               goto err_dma_config;
        }
 
        return 0;
 
+err_dma_config:
+       dma_release_channel(dd->dma_tx);
 err_dma_tx:
-       dma_release_channel(dd->dma_rx1);
        dma_release_channel(dd->dma_rx2);
+err_dma_rx2:
+       dma_release_channel(dd->dma_rx1);
 
        return ret;
 }
@@ -2364,7 +2367,7 @@ static int sa_ul_probe(struct platform_device *pdev)
        sa_init_mem(dev_data);
        ret = sa_dma_init(dev_data);
        if (ret)
-               goto disable_pm_runtime;
+               goto destroy_dma_pool;
 
        spin_lock_init(&dev_data->scid_lock);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2394,9 +2397,9 @@ release_dma:
        dma_release_channel(dev_data->dma_rx1);
        dma_release_channel(dev_data->dma_tx);
 
+destroy_dma_pool:
        dma_pool_destroy(dev_data->sc_pool);
 
-disable_pm_runtime:
        pm_runtime_put_sync(&pdev->dev);
        pm_runtime_disable(&pdev->dev);