ion: check return value from remap_pfn_range
authorColin Cross <ccross@android.com>
Sat, 14 Dec 2013 03:26:23 +0000 (19:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2013 16:59:53 +0000 (08:59 -0800)
Check the return value of remap_pfn_range and return an error if
it fails.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/ion/ion_heap.c

index ce31561637040ab36b973cc5592d6e1927f0074d..ecc14fd9f6ac46e0694b39b7d2f0eac0f051fd6e 100644 (file)
@@ -76,6 +76,7 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
        unsigned long offset = vma->vm_pgoff * PAGE_SIZE;
        struct scatterlist *sg;
        int i;
+       int ret;
 
        for_each_sg(table->sgl, sg, table->nents, i) {
                struct page *page = sg_page(sg);
@@ -91,8 +92,10 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
                        offset = 0;
                }
                len = min(len, remainder);
-               remap_pfn_range(vma, addr, page_to_pfn(page), len,
+               ret = remap_pfn_range(vma, addr, page_to_pfn(page), len,
                                vma->vm_page_prot);
+               if (ret)
+                       return ret;
                addr += len;
                if (addr >= vma->vm_end)
                        return 0;