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.15 296/667] spi: spi-fsl-qspi: check return value after calling platform_get_resource_byname()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit a2b331ac11e1cac56f5b7d367e9f3c5796deaaed ]

    It will cause null-ptr-deref if platform_get_resource_byname() returns NULL,
    we need check the return value.

    Fixes: 858e26a515c2 ("spi: spi-fsl-qspi: Reduce devm_ioremap size to 4 times AHB buffer size")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Link: https://lore.kernel.org/r/20220505093954.1285615-1-yangyingliang@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-fsl-qspi.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
    index 9851551ebbe0..46ae46a944c5 100644
    --- a/drivers/spi/spi-fsl-qspi.c
    +++ b/drivers/spi/spi-fsl-qspi.c
    @@ -876,6 +876,10 @@ static int fsl_qspi_probe(struct platform_device *pdev)

    res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
    "QuadSPI-memory");
    + if (!res) {
    + ret = -EINVAL;
    + goto err_put_ctrl;
    + }
    q->memmap_phy = res->start;
    /* Since there are 4 cs, map size required is 4 times ahb_buf_size */
    q->ahb_addr = devm_ioremap(dev, q->memmap_phy,
    --
    2.35.1


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