From: Lad, Prabhakar <[email protected]> >From commit 068a0df76023926af958a336a78bef60468d2033 "[media] media: vb2: add length check for mmap" patch verifies that the mmap() size requested by userspace doesn't exceed the buffer size.
As the mmap() size is rounded up to the next page boundary the check will fail for buffer sizes that are not multiple of the page size. This patch fixes the check by aligning the buffer size to page size during the check. Alongside fixes the vmalloc allocator to round up the size. Signed-off-by: Lad, Prabhakar <[email protected]> Cc: Laurent Pinchart <[email protected]> Cc: Marek Szyprowski <[email protected]> Cc: Seung-Woo Kim <[email protected]> Cc: Hans Verkuil <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> --- drivers/media/v4l2-core/videobuf2-core.c | 2 +- drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 58c1744..223fcd4 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1886,7 +1886,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma) vb = q->bufs[buffer]; - if (vb->v4l2_planes[plane].length < (vma->vm_end - vma->vm_start)) { + if (PAGE_ALIGN(vb->v4l2_planes[plane].length) < (vma->vm_end - vma->vm_start)) { dprintk(1, "Invalid length\n"); return -EINVAL; } diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c index 313d977..bf3b95c 100644 --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c @@ -44,7 +44,7 @@ static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fl return NULL; buf->size = size; - buf->vaddr = vmalloc_user(buf->size); + buf->vaddr = vmalloc_user(PAGE_ALIGN(buf->size)); buf->handler.refcount = &buf->refcount; buf->handler.put = vb2_vmalloc_put; buf->handler.arg = buf; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
