[media] sh_vou: fix memory leak on error paths in sh_vou_open()
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 <khoroshilov@ispras.ru> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
6ab6a026bc
commit
2160abb294
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue