Commit 0862d95b authored by Baskov Evgeniy's avatar Baskov Evgeniy Committed by Mauro Carvalho Chehab
Browse files

media: s5p-jpeg: handle error condition in s5p_jpeg_probe 



If an error happens in jpeg_get_drv_data(), i.e. match fails,
jpeg->variant field is NULL, so we cannot access it.

Consider device probe failed if jpeg->variant is NULL.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarBaskov Evgeniy <baskov@ispras.ru>
Acked-by: default avatarAndrzej Pietrasiewicz <andrzejtp2010@gmail.com>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 3c39a16d

drivers/media/platform/s5p-jpeg/jpeg-core.c

+2 −0
Original line number Diff line number Diff line
@@ -2862,6 +2862,8 @@ static int s5p_jpeg_probe(struct platform_device *pdev) 
		return -ENOMEM;



	jpeg->variant = jpeg_get_drv_data(&pdev->dev);

	if (!jpeg->variant)

		return -ENODEV;



	mutex_init(&jpeg->lock);

	spin_lock_init(&jpeg->slock);