| From f7744f1c020045abc4abf3a6549733a5bf93a0f8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 11 Aug 2021 15:32:28 +0200 |
| Subject: media: s5p-mfc: Add checking to s5p_mfc_probe(). |
| |
| From: Nadezda Lutovinova <lutovinova@ispras.ru> |
| |
| [ 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> |
| --- |
| drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c |
| index f8a5ed6bb9d7a..9faecd049002f 100644 |
| --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c |
| +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c |
| @@ -1284,6 +1284,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); |
| -- |
| 2.33.0 |
| |
