projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
76f5bd1
)
spi: spi-fsl-qspi: check return value after calling platform_get_resource_byname()
author
Yang Yingliang
<yangyingliang@huawei.com>
Thu, 5 May 2022 09:39:54 +0000
(17:39 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:22:55 +0000
(10:22 +0200)
[ 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
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-fsl-qspi.c
b/drivers/spi/spi-fsl-qspi.c
index
9851551
..
46ae46a
100644
(file)
--- 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,