media: DaVinci-VPBE: fix error handling in vpbe_initialize()

If vpbe_set_default_output() or vpbe_set_default_mode() fails,
vpbe_initialize() returns error code without releasing resources.

The patch adds error handling for that case.

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

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index e80d7806cc451b1ac814def1ab593d303146cc53..4766a7a23d16f8a479c3352699652c49d123050d 100644 (file)
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -718,7 +718,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
        if (ret) {
                v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default output %s",
                         def_output);
-               return ret;
+               goto fail_kfree_amp;
        }
 
        printk(KERN_NOTICE "Setting default mode to %s\n", def_mode);
@@ -726,12 +726,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
        if (ret) {
                v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default mode %s",
                         def_mode);
-               return ret;
+               goto fail_kfree_amp;
        }
        vpbe_dev->initialized = 1;
        /* TBD handling of bootargs for default output and mode */
        return 0;
 
+fail_kfree_amp:
+       mutex_lock(&vpbe_dev->lock);
+       kfree(vpbe_dev->amp);
 fail_kfree_encoders:
        kfree(vpbe_dev->encoders);
 fail_dev_unregister: