summaryrefslogtreecommitdiffstats
path: root/drivers/tee
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2017-05-15 11:09:28 +0200
committerJens Wiklander <jens.wiklander@linaro.org>2017-08-04 10:30:27 +0200
commitefb14036bd7f8914f721e1e82891d4ba617cc784 (patch)
tree320c5dadab0b3dd6c22f61f00dac63f709ebc632 /drivers/tee
parent16f73eb02d7e1765ccab3d2018e0bd98eb93d973 (diff)
downloadlinux-stable-efb14036bd7f8914f721e1e82891d4ba617cc784.tar.gz
linux-stable-efb14036bd7f8914f721e1e82891d4ba617cc784.tar.bz2
linux-stable-efb14036bd7f8914f721e1e82891d4ba617cc784.zip
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>
Diffstat (limited to 'drivers/tee')
-rw-r--r--drivers/tee/optee/core.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 58169e519422..857141e29e80 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -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,