From: Naoya Horiguchi Date: Wed, 3 Apr 2019 07:02:14 +0000 (+0900) Subject: tools/power turbostat: fix buffer overrun X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=20a2f5951e88a8a29176a11ead3a13955a326599;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 3e5f8b3db272..19e345cf8193 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -4488,7 +4488,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");