diff options
| author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-11-23 07:05:58 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-22 21:10:01 +0100 |
| commit | deb89c6ef9d38f13dc2c1ca4261ea169ea9b30d9 (patch) | |
| tree | 5f09d509f0cc4b9e27e806c585502d1cd8862c34 | |
| parent | 8ebc192f90918fa1fc19f21710b47a5d0898c336 (diff) | |
| download | linux-stable-deb89c6ef9d38f13dc2c1ca4261ea169ea9b30d9.tar.gz linux-stable-deb89c6ef9d38f13dc2c1ca4261ea169ea9b30d9.tar.bz2 linux-stable-deb89c6ef9d38f13dc2c1ca4261ea169ea9b30d9.zip | |
media: vb2: be sure to unlock mutex on errors
commit c06ef2e9acef4cda1feee2ce055b8086e33d251a upstream.
As reported by smatch:
drivers/media/common/videobuf2/videobuf2-core.c: drivers/media/common/videobuf2/videobuf2-core.c:2159 vb2_mmap() warn: inconsistent returns 'mutex:&q->mmap_lock'.
Locked on: line 2148
Unlocked on: line 2100
line 2108
line 2113
line 2118
line 2156
line 2159
There is one error condition that doesn't unlock a mutex.
Fixes: cd26d1c4d1bc ("media: vb2: vb2_mmap: move lock up")
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 7b3f88715156..fa77e2ae4ec4 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -2173,7 +2173,8 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma) if (length < (vma->vm_end - vma->vm_start)) { dprintk(1, "MMAP invalid, as it would overflow buffer length\n"); - return -EINVAL; + ret = -EINVAL; + goto unlock; } ret = call_memop(vb, mmap, vb->planes[plane].mem_priv, vma); |