diff options
author | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> | 2019-04-03 16:02:14 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 07:18:43 +0200 |
commit | 0926ee9f5327c77db7efd60dbc3989546cc525c2 (patch) | |
tree | c61bc2baf8a59fff0d2629a6eec4e5fc1982d4e3 /tools | |
parent | 94132aca9472a6cff8292149f5cea69f6ffeb51e (diff) | |
download | linux-stable-0926ee9f5327c77db7efd60dbc3989546cc525c2.tar.gz linux-stable-0926ee9f5327c77db7efd60dbc3989546cc525c2.tar.bz2 linux-stable-0926ee9f5327c77db7efd60dbc3989546cc525c2.zip |
tools/power turbostat: fix buffer overrun
[ Upstream commit eeb71c950bc6eee460f2070643ce137e067b234c ]
turbostat could be terminated by general protection fault on some latest
hardwares which (for example) support 9 levels of C-states and show 18
"tADDED" lines. That bloats the total output and finally causes buffer
overrun. So let's extend the buffer to avoid this.
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 0ffbbcac4d19..752cb4c0fde6 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -5125,7 +5125,7 @@ int initialize_counters(int cpu_id) void allocate_output_buffer() { - output_buffer = calloc(1, (1 + topo.num_cpus) * 1024); + output_buffer = calloc(1, (1 + topo.num_cpus) * 2048); outp = output_buffer; if (outp == NULL) err(-1, "calloc output buffer"); |