OSDN Git Service

media: s5p-jpeg: handle error condition in s5p_jpeg_probe
authorBaskov Evgeniy <baskov@ispras.ru>
Fri, 13 Nov 2020 16:06:25 +0000 (17:06 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 3 Dec 2020 06:45:49 +0000 (07:45 +0100)
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: Baskov Evgeniy <baskov@ispras.ru>
Acked-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/s5p-jpeg/jpeg-core.c

index 9b22dd8..0261115 100644 (file)
@@ -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);