From: Laura Abbott <lauraa@codeaurora.org>
Date: Fri, 13 Dec 2013 22:23:49 +0000 (-0800)
Subject: gpu: ion: Map only the vma size given
X-Git-Tag: firefly_0821_release~176^2~4489^2~470
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7b903e44c40fdd8300582b0791ef20b70d81178c;p=firefly-linux-kernel-4.4.55.git

gpu: ion: Map only the vma size given

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

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index e8c4e36d5328..16f4fc7da414 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -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));
 }