lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 45/59] tools/power turbostat: fix buffer overrun
    Date
    From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>

    [ 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>
    ---
    tools/power/x86/turbostat/turbostat.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
    index 3e5f8b3db2720..19e345cf8193e 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");
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-20 00:18    [W:4.062 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site