perf record: Fix failed memory allocation for get_cpuid_str
authorThomas Richter <tmricht@linux.vnet.ibm.com>
Wed, 17 Jan 2018 13:16:11 +0000 (14:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Apr 2018 09:02:06 +0000 (11:02 +0200)
[ 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/perf/arch/x86/util/header.c

index 33027c5e6f920b20bff66577f08d60d4905b6020..c6b5204e02804d7521b016cbd6981991f8d92061 100644 (file)
@@ -70,7 +70,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;
        }