diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-31 21:24:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-31 21:24:26 -0700 |
| commit | a3f4c6146c0010222eb4b793ebee29277150dfda (patch) | |
| tree | 3032678359e013d5b686cb7d82937b382b3925af | |
| parent | a9654d0f73f3c230658531e26ff34824dbdfc092 (diff) | |
| parent | 775e281fb6c19350f5c65e83e7c4b768c67bbe44 (diff) | |
Merge "trace: ipc_logging: Avoid buffer overflow in ipc_log_string()"
| -rw-r--r-- | kernel/trace/ipc_logging.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ipc_logging.c b/kernel/trace/ipc_logging.c index 2c3e0998d400..ed29c38cd7fb 100644 --- a/kernel/trace/ipc_logging.c +++ b/kernel/trace/ipc_logging.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -507,8 +507,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; |