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 072/862] dmaengine: qcom-adm: fix wrong sizeof config in slave_config
    Date
    From: Christian Marangi <ansuelsmth@gmail.com>

    commit 7c8765308371be30f50c1b5b97618b731514b207 upstream.

    Fix broken slave_config function that uncorrectly compare the
    peripheral_size with the size of the config pointer instead of the size
    of the config struct. This cause the crci value to be ignored and cause
    a kernel panic on any slave that use adm driver.

    To fix this, compare to the size of the struct and NOT the size of the
    pointer.

    Fixes: 03de6b273805 ("dmaengine: qcom-adm: stop abusing slave_id config")
    Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
    Cc: stable@vger.kernel.org # v5.17+
    Reviewed-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
    Link: https://lore.kernel.org/r/20220915204844.3838-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 | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/dma/qcom/qcom_adm.c
    +++ b/drivers/dma/qcom/qcom_adm.c
    @@ -494,7 +494,7 @@ static int adm_slave_config(struct dma_c

    spin_lock_irqsave(&achan->vc.lock, flag);
    memcpy(&achan->slave, cfg, sizeof(struct dma_slave_config));
    - if (cfg->peripheral_size == sizeof(config))
    + if (cfg->peripheral_size == sizeof(*config))
    achan->crci = config->crci;
    spin_unlock_irqrestore(&achan->vc.lock, flag);


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