mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
media: videobuf-dma-contig: Use size of buffer in mmap not vma size
The size of the vma can be larger than the size of the backing buffer. Use the buffer size over vma size to prevent exposing extra memory to userspace. Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
6211e44a4d
commit
8357062148
1 changed files with 1 additions and 3 deletions
|
@ -280,7 +280,6 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
|||
struct videobuf_dma_contig_memory *mem;
|
||||
struct videobuf_mapping *map;
|
||||
int retval;
|
||||
unsigned long size;
|
||||
|
||||
dev_dbg(q->dev, "%s\n", __func__);
|
||||
|
||||
|
@ -303,7 +302,6 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
|||
goto error;
|
||||
|
||||
/* Try to remap memory */
|
||||
size = vma->vm_end - vma->vm_start;
|
||||
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
|
||||
|
||||
/* the "vm_pgoff" is just used in v4l2 to find the
|
||||
|
@ -314,7 +312,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
|
|||
*/
|
||||
vma->vm_pgoff = 0;
|
||||
|
||||
retval = vm_iomap_memory(vma, mem->dma_handle, size);
|
||||
retval = vm_iomap_memory(vma, mem->dma_handle, mem->size);
|
||||
if (retval) {
|
||||
dev_err(q->dev, "mmap: remap failed with error %d. ",
|
||||
retval);
|
||||
|
|
Loading…
Reference in a new issue