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

Commit 1473aa42 authored by Patrick Daly's avatar Patrick Daly
Browse files

ion: ion_system_heap: SetPagePrivate when splitting secure pages 



The kgsl driver relies on checking the PagePrivate flag for secure memory.
Commit 29defcc9 ("ion: Snapshot for 4.8
kernel upgrade") did not properly set this flag in all cases.

Change-Id: I4f29ee151158cd70a1617d365decc7d3fd8fe6ac
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 345c814e

drivers/staging/android/ion/ion_system_heap.c

+9 −4
Original line number Diff line number Diff line
@@ -205,11 +205,16 @@ static struct page *split_page_from_secure_pool(struct ion_system_heap *heap, 
		split_page(page, order);

		break;

	}

	/* Return the remaining order-0 pages to the pool */

	if (page)

		for (j = 1; j < (1 << order); j++)

	/*

	 * Return the remaining order-0 pages to the pool.

	 * SetPagePrivate flag to mark memory as secure.

	 */

	if (page) {

		for (j = 1; j < (1 << order); j++) {

			SetPagePrivate(page + j);

			free_buffer_page(heap, buffer, page + j, 0);



		}

	}

got_page:

	mutex_unlock(&heap->split_page_mutex);