media: davinci: vpif: Fix memory leak in probe error path

commit 024bf40edf1155e7a587f0ec46294049777d9b02 upstream.

If an error occurs during the initialization of `pdev_display`,
the allocated platform device `pdev_capture` is not released properly,
leading to a memory leak.

Adjust error path handling to fix the leak.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 43acb728bbc4 ("media: davinci: vpif: fix use-after-free on driver unbind")
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Nikiforov <Dm1tryNk@yandex.ru>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/ti/davinci/vpif.c b/drivers/media/platform/ti/davinci/vpif.c
index da27da4c165a01e5bd78675a2b7076ccac1e3842..76f8dda8c091404c5b334dd07071e086584d428b 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif.c
+++ b/drivers/media/platform/ti/davinci/vpif.c
@@ -505,7 +505,7 @@ static int vpif_probe(struct platform_device *pdev)
        pdev_display = kzalloc(sizeof(*pdev_display), GFP_KERNEL);
        if (!pdev_display) {
                ret = -ENOMEM;
-               goto err_put_pdev_capture;
+               goto err_del_pdev_capture;
        }
 
        pdev_display->name = "vpif_display";
@@ -528,6 +528,8 @@ static int vpif_probe(struct platform_device *pdev)
 
 err_put_pdev_display:
        platform_device_put(pdev_display);
+err_del_pdev_capture:
+       platform_device_del(pdev_capture);
 err_put_pdev_capture:
        platform_device_put(pdev_capture);
 err_put_rpm: