Merge "ion: fix hyp_assign_sg failure handling" (179f781a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/android/ion/ion_system_secure_heap.c

+10 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/slab.h>
		@@ -114,7 +114,9 @@ static void process_one_prefetch(struct ion_heap *sys_heap,
		goto out;

		ret = ion_hyp_assign_sg(buffer.sg_table, &vmid, 1, true);
		if (ret)
		if (ret == -EADDRNOTAVAIL)
		goto out1;
		else if (ret < 0)
		goto out;

		/* Now free it to the secure heap */
		@@ -123,6 +125,12 @@ static void process_one_prefetch(struct ion_heap *sys_heap,

		out:
		sys_heap->ops->free(&buffer);
		out1:
		/*
		* The security state of the pages is unknown after a failure;
		* They can neither be added back to the secure pool nor buddy system.
		*/
		return;
		}

		/*