lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 226/593] crypto: sa2ul - Fix leaks on failure paths with sa_dma_init()
    Date
    From: Suman Anna <s-anna@ti.com>

    [ 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>
    ---
    drivers/crypto/sa2ul.c | 21 ++++++++++++---------
    1 file changed, 12 insertions(+), 9 deletions(-)

    diff --git a/drivers/crypto/sa2ul.c b/drivers/crypto/sa2ul.c
    index 4640fe0c1f22..fdc844363f02 100644
    --- a/drivers/crypto/sa2ul.c
    +++ b/drivers/crypto/sa2ul.c
    @@ -2270,9 +2270,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");
    @@ -2293,28 +2293,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;
    }
    @@ -2359,7 +2362,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);
    @@ -2389,9 +2392,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);

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:10    [W:2.639 / U:0.644 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site