提交 d5f1b031 编写于 作者: Y Yang Yingliang 提交者: Zheng Zengkai

spi: spi-fsl-qspi: check return value after calling platform_get_resource_byname()

stable inclusion
from stable-v5.10.121
commit 560dcbe1c7a78f597f2167371ebdbe2bca3d0735
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=560dcbe1c7a78f597f2167371ebdbe2bca3d0735

--------------------------------

[ Upstream commit a2b331ac ]

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

Fixes: 858e26a5 ("spi: spi-fsl-qspi: Reduce devm_ioremap size to 4 times AHB buffer size")
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220505093954.1285615-1-yangyingliang@huawei.comSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 a6aa6548
...@@ -876,6 +876,10 @@ static int fsl_qspi_probe(struct platform_device *pdev) ...@@ -876,6 +876,10 @@ static int fsl_qspi_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"QuadSPI-memory"); "QuadSPI-memory");
if (!res) {
ret = -EINVAL;
goto err_put_ctrl;
}
q->memmap_phy = res->start; q->memmap_phy = res->start;
/* Since there are 4 cs, map size required is 4 times ahb_buf_size */ /* Since there are 4 cs, map size required is 4 times ahb_buf_size */
q->ahb_addr = devm_ioremap(dev, q->memmap_phy, q->ahb_addr = devm_ioremap(dev, q->memmap_phy,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册