Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e460bc5e authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman
Browse files

ion: check return value from remap_pfn_range 



Check the return value of remap_pfn_range and return an error if
it fails.

Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce3d1093

drivers/staging/android/ion/ion_heap.c

+4 −1
Original line number Diff line number Diff line
@@ -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;