gpu: ion: Only map as much of the vma as the user requested
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 13 Dec 2013 22:23:58 +0000 (14:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2013 16:55:38 +0000 (08:55 -0800)
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>
drivers/staging/android/ion/ion_system_heap.c

index 3f607df63809204af9fd3c01ced29a6578854406..7397bc41fb45f0d869107a2cffcfb86e9feb1e93 100644 (file)
@@ -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;
 }