commit 9453ed4d18b6a785f088506bdfcee002b49455c4
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 06 11:55:03 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 06 11:55:03 2017 -0700
tree 00aaa92a4ddb855e5a98c174b050b8fbc36f62f6
parent b9ac23c0071561cd6d31a2be0b5cc62075693912
parent f123c9aada9c636296cbe6b9caa9d051195720dd

Merge "trace: ipc_logging: Avoid buffer overflow in ipc_log_string()" into msm-4.9

kernel/trace/ipc_logging.c

diff --git a/kernel/trace/ipc_logging.c b/kernel/trace/ipc_logging.c
index fa7fd14..6d310ab 100644
--- a/kernel/trace/ipc_logging.c
+++ b/kernel/trace/ipc_logging.c
@@ -515,8 +515,8 @@ int ipc_log_string(void *ilctxt, const char *fmt, ...)
 	tsv_qtimer_write(&ectxt);
 	avail_size = (MAX_MSG_SIZE - (ectxt.offset + hdr_size));
 	va_start(arg_list, fmt);
-	data_size = vsnprintf((ectxt.buff + ectxt.offset + hdr_size),
-			      avail_size, fmt, arg_list);
+	data_size = vscnprintf((ectxt.buff + ectxt.offset + hdr_size),
+				avail_size, fmt, arg_list);
 	va_end(arg_list);
 	tsv_write_header(&ectxt, TSV_TYPE_BYTE_ARRAY, data_size);
 	ectxt.offset += data_size;