summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-04-07 18:30:14 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-04-19 16:29:56 +0200
commit2578dfb7f767076baf04eaf5fbf35a75afb9a1a7 (patch)
tree72dd9590490c76472c9a518249c219b91a4008ec /drivers
parent[media] v4l: Don't register media entities for subdev device nodes (diff)
downloadlinux-2578dfb7f767076baf04eaf5fbf35a75afb9a1a7.tar.xz
linux-2578dfb7f767076baf04eaf5fbf35a75afb9a1a7.zip
[media] omap3isp: queue: Don't corrupt buf->npages when get_user_pages() fails
get_user_pages() can return a negative error code when it fails. Set buf->npages to 0 in that case, to prevent isp_video_buffer_cleanup() from releasing invalid pages. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/omap3isp/ispqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/ispqueue.c b/drivers/media/video/omap3isp/ispqueue.c
index c91e56a5791e..9c317148205f 100644
--- a/drivers/media/video/omap3isp/ispqueue.c
+++ b/drivers/media/video/omap3isp/ispqueue.c
@@ -339,7 +339,7 @@ static int isp_video_buffer_prepare_user(struct isp_video_buffer *buf)
up_read(&current->mm->mmap_sem);
if (ret != buf->npages) {
- buf->npages = ret;
+ buf->npages = ret < 0 ? 0 : ret;
isp_video_buffer_cleanup(buf);
return -EFAULT;
}