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 261/667] mtd: rawnand: intel: fix possible null-ptr-deref in ebu_nand_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit ddf66aefd685fd46500b9917333e1b1e118276dc ]

    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.

    Fixes: 0b1039f016e8 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20220426084913.4021868-2-yangyingliang@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/nand/raw/intel-nand-controller.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c
    index 7c1c80dae826..e91b879b32bd 100644
    --- a/drivers/mtd/nand/raw/intel-nand-controller.c
    +++ b/drivers/mtd/nand/raw/intel-nand-controller.c
    @@ -619,9 +619,9 @@ static int ebu_nand_probe(struct platform_device *pdev)
    resname = devm_kasprintf(dev, GFP_KERNEL, "nand_cs%d", cs);
    res = platform_get_resource_byname(pdev, IORESOURCE_MEM, resname);
    ebu_host->cs[cs].chipaddr = devm_ioremap_resource(dev, res);
    - ebu_host->cs[cs].nand_pa = res->start;
    if (IS_ERR(ebu_host->cs[cs].chipaddr))
    return PTR_ERR(ebu_host->cs[cs].chipaddr);
    + ebu_host->cs[cs].nand_pa = res->start;

    ebu_host->clk = devm_clk_get(dev, NULL);
    if (IS_ERR(ebu_host->clk))
    --
    2.35.1


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