]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
gpu: ion: Map only the vma size given
authorLaura Abbott <lauraa@codeaurora.org>
Fri, 13 Dec 2013 22:23:49 +0000 (14:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2013 16:55:37 +0000 (08:55 -0800)
When mapping carveout buffers into userspace, only map
the size of the vma given, not the full size of the buffer
since clients may map less than the buffer size.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/ion/ion_carveout_heap.c

index e8c4e36d532868d8480fba55f6764477bb052b7c..16f4fc7da41416e414aa92f5df5132ca054a7199 100644 (file)
@@ -116,7 +116,7 @@ int ion_carveout_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
 {
        return remap_pfn_range(vma, vma->vm_start,
                               __phys_to_pfn(buffer->priv_phys) + vma->vm_pgoff,
-                              buffer->size,
+                              vma->vm_end - vma->vm_start,
                               pgprot_noncached(vma->vm_page_prot));
 }