summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadezda Lutovinova <lutovinova@ispras.ru>2021-08-11 15:32:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-26 11:40:27 +0100
commit9a2e0cc9e50f00b20e326deea552fae84924693c (patch)
treeb6890d90e5c5c74d6a9642a796162b450c600fd3
parent08f07b4e69972dd507c2e114e79683dddfd751bc (diff)
media: s5p-mfc: Add checking to s5p_mfc_probe().
[ Upstream commit cdfaf4752e6915a4b455ad4400133e540e4dc965 ] If of_device_get_match_data() return NULL, then null pointer dereference occurs in s5p_mfc_init_pm(). The patch adds checking if dev->variant is NULL. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Nadezda Lutovinova <lutovinova@ispras.ru> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 63d46fae9b28..75be40608bae 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1285,6 +1285,10 @@ static int s5p_mfc_probe(struct platform_device *pdev)
}
dev->variant = of_device_get_match_data(&pdev->dev);
+ if (!dev->variant) {
+ dev_err(&pdev->dev, "Failed to get device MFC hardware variant information\n");
+ return -ENOENT;
+ }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dev->regs_base = devm_ioremap_resource(&pdev->dev, res);