Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2b2f917 authored by Nadezda Lutovinova's avatar Nadezda Lutovinova Committed by Greg Kroah-Hartman
Browse files

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: default avatarNadezda Lutovinova <lutovinova@ispras.ru>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6b8ab552

drivers/media/platform/s5p-mfc/s5p_mfc.c

+4 −0
Original line number Diff line number Diff line
@@ -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);