summaryrefslogtreecommitdiff
path: root/drivers/staging/media/atomisp/pci/atomisp2/hmm
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-03-20 14:40:32 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-21 08:04:32 +0100
commitaf4fd0e7a43633e768685b8baf0b5d11d952bbe6 (patch)
tree3d302e5a4682f57025ea27d88e78c7e0f1dbae56 /drivers/staging/media/atomisp/pci/atomisp2/hmm
parent08dcded491c90229295027771447bf0ff9882be6 (diff)
Staging: atomisp: fix locking in alloc_user_pages()
We call this function with the lock held and should also return with the lock held as well. This one error path is not-consistent because we should return without the lock held. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/hmm')
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
index e2aa94991aee..82593ef35b2d 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
@@ -1011,6 +1011,7 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
dev_err(atomisp_dev, "find_vma failed\n");
atomisp_kernel_free(bo->page_obj);
atomisp_kernel_free(pages);
+ mutex_lock(&bo->mutex);
return -EFAULT;
}
mutex_lock(&bo->mutex);