lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 224/293] perf record: Fix failed memory allocation for get_cpuid_str
    Date
    From: Thomas Richter <tmricht@linux.vnet.ibm.com>

    [ Upstream commit 81fccd6ca507d3b2012eaf1edeb9b1dbf4bd22db ]

    In x86 architecture dependend part function get_cpuid_str() mallocs a
    128 byte buffer, but does not check if the memory allocation succeeded
    or not.

    When the memory allocation fails, function __get_cpuid() is called with
    first parameter being a NULL pointer. However this function references
    its first parameter and operates on a NULL pointer which might cause
    core dumps.

    Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Link: http://lkml.kernel.org/r/20180117131611.34319-1-tmricht@linux.vnet.ibm.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    tools/perf/arch/x86/util/header.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c
    index a74a48db26f5..2eb11543e2e9 100644
    --- a/tools/perf/arch/x86/util/header.c
    +++ b/tools/perf/arch/x86/util/header.c
    @@ -69,7 +69,7 @@ get_cpuid_str(void)
    {
    char *buf = malloc(128);

    - if (__get_cpuid(buf, 128, "%s-%u-%X$") < 0) {
    + if (buf && __get_cpuid(buf, 128, "%s-%u-%X$") < 0) {
    free(buf);
    return NULL;
    }
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 03:56    [W:2.545 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site