diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2013-12-13 14:23:58 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-14 08:55:38 -0800 |
| commit | b82302438bbb496c76d5c4d64d82263253b0ac2b (patch) | |
| tree | ed875ff258145232674e7e7f791c722d79dc2bf3 /drivers/staging/android | |
| parent | 55808b8d4dbd907834ac11e4959ef7d7040c3982 (diff) | |
gpu: ion: Only map as much of the vma as the user requested
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
[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>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/ion/ion_system_heap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 3f607df63809..7397bc41fb45 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -192,6 +192,8 @@ int ion_system_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, remap_pfn_range(vma, addr, page_to_pfn(sg_page(sg)), sg_dma_len(sg), vma->vm_page_prot); addr += sg_dma_len(sg); + if (addr >= vma->vm_end) + return 0; } return 0; } |