From 70ca7ca60da4825d1c4db0756002e4ff2979d210 Mon Sep 17 00:00:00 2001 From: Zhen Kong Date: Fri, 16 Jun 2017 11:55:07 -0700 Subject: [PATCH] qseecom: use strnlen in qseecom_start_app The appname received by qseecom_start_app() can be non-null terminated string beyond the max size check. Change strlen to strnlen. CRs-fixed: 2062061 Change-Id: I845d244336b5c81cedb2153d1303585f16819d58 Signed-off-by: Zhen Kong --- drivers/misc/qseecom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index 500185546599..7cdcd69cecf4 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -4379,9 +4379,9 @@ int qseecom_start_app(struct qseecom_handle **handle, return -EINVAL; } - if (strlen(app_name) >= MAX_APP_NAME_SIZE) { + if (strnlen(app_name, MAX_APP_NAME_SIZE) == MAX_APP_NAME_SIZE) { pr_err("The app_name (%s) with length %zu is not valid\n", - app_name, strlen(app_name)); + app_name, strnlen(app_name, MAX_APP_NAME_SIZE)); return -EINVAL; }