lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 073/862] dmaengine: qcom-adm: fix wrong calling convention for prep_slave_sg
    Date
    From: Christian Marangi <ansuelsmth@gmail.com>

    commit b9d2140c3badf4107973ad77c5a0ec3075705c85 upstream.

    The calling convention for pre_slave_sg is to return NULL on error and
    provide an error log to the system. Qcom-adm instead provide error
    pointer when an error occur. This indirectly cause kernel panic for
    example for the nandc driver that checks only if the pointer returned by
    device_prep_slave_sg is not NULL. Returning an error pointer makes nandc
    think the device_prep_slave_sg function correctly completed and makes
    the kernel panics later in the code.

    While nandc is the one that makes the kernel crash, it was pointed out
    that the real problem is qcom-adm not following calling convention for
    that function.

    To fix this, drop returning error pointer and return NULL with an error
    log.

    Fixes: 03de6b273805 ("dmaengine: qcom-adm: stop abusing slave_id config")
    Fixes: 5c9f8c2dbdbe ("dmaengine: qcom: Add ADM driver")
    Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
    Cc: stable@vger.kernel.org # v5.11+
    Link: https://lore.kernel.org/r/20220916041256.7104-1-ansuelsmth@gmail.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/dma/qcom/qcom_adm.c | 20 +++++++++++++-------
    1 file changed, 13 insertions(+), 7 deletions(-)

    --- a/drivers/dma/qcom/qcom_adm.c
    +++ b/drivers/dma/qcom/qcom_adm.c
    @@ -379,13 +379,13 @@ static struct dma_async_tx_descriptor *a
    if (blk_size < 0) {
    dev_err(adev->dev, "invalid burst value: %d\n",
    burst);
    - return ERR_PTR(-EINVAL);
    + return NULL;
    }

    crci = achan->crci & 0xf;
    if (!crci || achan->crci > 0x1f) {
    dev_err(adev->dev, "invalid crci value\n");
    - return ERR_PTR(-EINVAL);
    + return NULL;
    }
    }

    @@ -403,8 +403,10 @@ static struct dma_async_tx_descriptor *a
    }

    async_desc = kzalloc(sizeof(*async_desc), GFP_NOWAIT);
    - if (!async_desc)
    - return ERR_PTR(-ENOMEM);
    + if (!async_desc) {
    + dev_err(adev->dev, "not enough memory for async_desc struct\n");
    + return NULL;
    + }

    async_desc->mux = achan->mux ? ADM_CRCI_CTL_MUX_SEL : 0;
    async_desc->crci = crci;
    @@ -414,8 +416,10 @@ static struct dma_async_tx_descriptor *a
    sizeof(*cple) + 2 * ADM_DESC_ALIGN;

    async_desc->cpl = kzalloc(async_desc->dma_len, GFP_NOWAIT);
    - if (!async_desc->cpl)
    + if (!async_desc->cpl) {
    + dev_err(adev->dev, "not enough memory for cpl struct\n");
    goto free;
    + }

    async_desc->adev = adev;

    @@ -437,8 +441,10 @@ static struct dma_async_tx_descriptor *a
    async_desc->dma_addr = dma_map_single(adev->dev, async_desc->cpl,
    async_desc->dma_len,
    DMA_TO_DEVICE);
    - if (dma_mapping_error(adev->dev, async_desc->dma_addr))
    + if (dma_mapping_error(adev->dev, async_desc->dma_addr)) {
    + dev_err(adev->dev, "dma mapping error for cpl\n");
    goto free;
    + }

    cple_addr = async_desc->dma_addr + ((void *)cple - async_desc->cpl);

    @@ -454,7 +460,7 @@ static struct dma_async_tx_descriptor *a

    free:
    kfree(async_desc);
    - return ERR_PTR(-ENOMEM);
    + return NULL;
    }

    /**

    \
     
     \ /
      Last update: 2022-10-19 10:49    [W:4.489 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site