Skip to content

Commit acaa3f1

Browse files
Wei Yongjunsuperna9999
authored andcommitted
drm/meson: Fix potential NULL dereference in meson_drv_bind_master()
platform_get_resource_byname() may fail and return NULL, so we should better check it's return value to avoid a NULL pointer dereference a bit later in the code. This is detected by Coccinelle semantic patch. @@ expression pdev, res, n, t, e, e1, e2; @@ res = platform_get_resource_byname(pdev, t, n); + if (!res) + return -EINVAL; ... when != res == NULL e = devm_ioremap(e1, res->start, e2); Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Acked-by: Neil Armstrong <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ddc389f commit acaa3f1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/gpu/drm/meson/meson_drv.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
197197
priv->io_base = regs;
198198

199199
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi");
200+
if (!res)
201+
return -EINVAL;
200202
/* Simply ioremap since it may be a shared register zone */
201203
regs = devm_ioremap(dev, res->start, resource_size(res));
202204
if (!regs) {
@@ -213,6 +215,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
213215
}
214216

215217
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc");
218+
if (!res)
219+
return -EINVAL;
216220
/* Simply ioremap since it may be a shared register zone */
217221
regs = devm_ioremap(dev, res->start, resource_size(res));
218222
if (!regs) {

0 commit comments

Comments
 (0)