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

Commit 62275d49 authored by Jens Wiklander's avatar Jens Wiklander Committed by Victor Chong
Browse files

BACKPORT: tee: optee: fix uninitialized symbol 'parg' 



Fixes the static checker warning in optee_release().
error: uninitialized symbol 'parg'.

Change-Id: I2eabb31695085cf1e96af8089ca91778bd7ce5a5
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit efb14036bd7f8914f721e1e82891d4ba617cc784)
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent 5a7ccb43

drivers/tee/optee/core.c

+6 −5
Original line number Diff line number Diff line
@@ -224,13 +224,14 @@ static void optee_release(struct tee_context *ctx) 
	if (!IS_ERR(shm)) {

		arg = tee_shm_get_va(shm, 0);

		/*

		 * If va2pa fails for some reason, we can't call

		 * optee_close_session(), only free the memory. Secure OS

		 * will leak sessions and finally refuse more sessions, but

		 * we will at least let normal world reclaim its memory.

		 * If va2pa fails for some reason, we can't call into

		 * secure world, only free the memory. Secure OS will leak

		 * sessions and finally refuse more sessions, but we will

		 * at least let normal world reclaim its memory.

		 */

		if (!IS_ERR(arg))

			tee_shm_va2pa(shm, arg, &parg);

			if (tee_shm_va2pa(shm, arg, &parg))

				arg = NULL; /* prevent usage of parg below */

	}



	list_for_each_entry_safe(sess, sess_tmp, &ctxdata->sess_list,