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

Commit 997ca62f authored by Rohit kumar's avatar Rohit kumar Committed by Daniel Rosenberg
Browse files

UPSTREAM staging: ion: Fix error handling in ion_buffer_create 



This patch fixes error handling case when buffer->pages allocation
fails. Also, it removes unreachable code of checking ret variable
although it is not updated.

Signed-off-by: default avatarRohit kumar <rohit.kr@samsung.com>
Reviewed-by: default avatarLaura Abbott <labbott@redhat.com>
Suggested-by: default avatarPintu Kumar <pintu.k@samsung.com>
Reviewed-by: default avatarPintu Kumar <pintu.k@samsung.com>
Reviewed-by: default avatarGioh Kim <gioh.kim@lge.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a56d092aa94ebcc9452ddaa47423b9a478aa6aa5)
Change-Id: Ic38b8e3ef0a21de4e38e58b4bb942535fe671ae5
Bug: 34283718
parent b06c3646

drivers/staging/android/ion/ion.c

+5 −10
Original line number Diff line number Diff line
@@ -213,10 +213,10 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
			"heap->ops->map_dma should return ERR_PTR on error"))

		table = ERR_PTR(-EINVAL);

	if (IS_ERR(table)) {

		heap->ops->free(buffer);

		kfree(buffer);

		return ERR_CAST(table);

		ret = -EINVAL;

		goto err1;

	}



	buffer->sg_table = table;

	if (ion_buffer_fault_user_mappings(buffer)) {

		int num_pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE;
@@ -226,7 +226,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
		buffer->pages = vmalloc(sizeof(struct page *) * num_pages);

		if (!buffer->pages) {

			ret = -ENOMEM;

			goto err1;

			goto err;

		}



		for_each_sg(table->sgl, sg, table->nents, i) {
@@ -235,9 +235,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
			for (j = 0; j < sg->length / PAGE_SIZE; j++)

				buffer->pages[k++] = page++;

		}



		if (ret)

			goto err;

	}



	buffer->dev = dev;
@@ -261,10 +258,8 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 


err:

	heap->ops->unmap_dma(heap, buffer);

	heap->ops->free(buffer);

err1:

	if (buffer->pages)

		vfree(buffer->pages);

	heap->ops->free(buffer);

err2:

	kfree(buffer);

	return ERR_PTR(ret);