]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe()
authorTuo Li <islituo@gmail.com>
Thu, 5 Aug 2021 07:55:35 +0000 (09:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:58:37 +0000 (11:58 +0100)
[ Upstream commit 8515965e5e33f4feb56134348c95953f3eadfb26 ]

The variable pdev is assigned to dev->plat_dev, and dev->plat_dev is
checked in:
  if (!dev->plat_dev)

This indicates both dev->plat_dev and pdev can be NULL. If so, the
function dev_err() is called to print error information.
  dev_err(&pdev->dev, "No platform data specified\n");

However, &pdev->dev is an illegal address, and it is dereferenced in
dev_err().

To fix this possible null-pointer dereference, replace dev_err() with
mfc_err().

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Tuo Li <islituo@gmail.com>
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

index 7727789dbda14112249f631fb14f196a749db77d..daa5b4dea092cdfca3bb43f9197342b519aef48c 100644 (file)
@@ -1102,7 +1102,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        spin_lock_init(&dev->condlock);
        dev->plat_dev = pdev;
        if (!dev->plat_dev) {
-               dev_err(&pdev->dev, "No platform data specified\n");
+               mfc_err("No platform data specified\n");
                return -ENODEV;
        }