commit 2578dfb7f767076baf04eaf5fbf35a75afb9a1a7
author Laurent Pinchart <laurent.pinchart@ideasonboard.com> Thu Apr 07 13:30:14 2011 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Tue Apr 19 11:29:56 2011 -0300
tree 72dd9590490c76472c9a518249c219b91a4008ec
parent c4f0b78ad5d0e76caaeb5c2349c2613728c816bc

[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>

drivers/media/video/omap3isp/ispqueue.c

diff --git a/drivers/media/video/omap3isp/ispqueue.c b/drivers/media/video/omap3isp/ispqueue.c
index c91e56a..9c31714 100644
--- a/drivers/media/video/omap3isp/ispqueue.c
+++ b/drivers/media/video/omap3isp/ispqueue.c
@@ -339,7 +339,7 @@
 	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;
 	}