lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 556/772] mfd: davinci_voicecodec: Fix possible null-ptr-deref davinci_vc_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 311242c7703df0da14c206260b7e855f69cb0264 ]

    It will cause null-ptr-deref when using 'res', if platform_get_resource()
    returns NULL, so move using 'res' after devm_ioremap_resource() that
    will check it to avoid null-ptr-deref.
    And use devm_platform_get_and_ioremap_resource() to simplify code.

    Fixes: b5e29aa880be ("mfd: davinci_voicecodec: Remove pointless #include")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Link: https://lore.kernel.org/r/20220426030857.3539336-1-yangyingliang@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/davinci_voicecodec.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
    index e5c8bc998eb4..965820481f1e 100644
    --- a/drivers/mfd/davinci_voicecodec.c
    +++ b/drivers/mfd/davinci_voicecodec.c
    @@ -46,14 +46,12 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
    }
    clk_enable(davinci_vc->clk);

    - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    -
    - fifo_base = (dma_addr_t)res->start;
    - davinci_vc->base = devm_ioremap_resource(&pdev->dev, res);
    + davinci_vc->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
    if (IS_ERR(davinci_vc->base)) {
    ret = PTR_ERR(davinci_vc->base);
    goto fail;
    }
    + fifo_base = (dma_addr_t)res->start;

    davinci_vc->regmap = devm_regmap_init_mmio(&pdev->dev,
    davinci_vc->base,
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:28    [W:5.106 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site