Browse Source

tee: optee: fix uninitialized symbol 'parg'

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

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Jens Wiklander 8 years ago
parent
commit
efb14036bd
1 changed files with 6 additions and 5 deletions
  1. 6 5
      drivers/tee/optee/core.c

+ 6 - 5
drivers/tee/optee/core.c

@@ -224,13 +224,14 @@ static void optee_release(struct tee_context *ctx)
 	if (!IS_ERR(shm)) {
 	if (!IS_ERR(shm)) {
 		arg = tee_shm_get_va(shm, 0);
 		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))
 		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,
 	list_for_each_entry_safe(sess, sess_tmp, &ctxdata->sess_list,