[PATCH] sh_vou: fix memory leak on error paths in sh_vou_open()

[Alexey Khoroshilov]

Memory allocated for sh_vou_file is not deallocated
on error paths in sh_vou_open().

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

Signed-off-by: Alexey Khoroshilov <khoroshi...@ispras.ru>
---
 drivers/media/platform/sh_vou.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 261f1195b49f..6d1959d1ad02 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -1168,10 +1168,10 @@ static int sh_vou_open(struct file *file)
 
        dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);
 
-       file->private_data = vou_file;
-
-       if (mutex_lock_interruptible(&vou_dev->fop_lock))
+       if (mutex_lock_interruptible(&vou_dev->fop_lock)) {
+               kfree(vou_file);
                return -ERESTARTSYS;
+       }
        if (atomic_inc_return(&vou_dev->use_count) == 1) {
                int ret;
                /* First open */
@@ -1183,6 +1183,7 @@ static int sh_vou_open(struct file *file)
                        pm_runtime_put(vou_dev->v4l2_dev.dev);
                        vou_dev->status = SH_VOU_IDLE;
                        mutex_unlock(&vou_dev->fop_lock);
+                       kfree(vou_file);
                        return ret;
                }
        }
@@ -1195,6 +1196,8 @@ static int sh_vou_open(struct file *file)
                                       vou_dev->vdev, &vou_dev->fop_lock);
        mutex_unlock(&vou_dev->fop_lock);
 
+       file->private_data = vou_file;
+
        return 0;
 }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html