From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932106AbeAQQji (ORCPT ); Wed, 17 Jan 2018 11:39:38 -0500 Received: from terminus.zytor.com ([65.50.211.136]:42609 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754185AbeAQQje (ORCPT ); Wed, 17 Jan 2018 11:39:34 -0500 Date: Wed, 17 Jan 2018 08:38:21 -0800 From: tip-bot for Thomas Richter Message-ID: Cc: hpa@zytor.com, schwidefsky@de.ibm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, brueckner@linux.vnet.ibm.com, heiko.carstens@de.ibm.com, tmricht@linux.vnet.ibm.com Reply-To: heiko.carstens@de.ibm.com, tmricht@linux.vnet.ibm.com, brueckner@linux.vnet.ibm.com, mingo@kernel.org, acme@redhat.com, schwidefsky@de.ibm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <20180117131611.34319-1-tmricht@linux.vnet.ibm.com> References: <20180117131611.34319-1-tmricht@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Fix failed memory allocation for get_cpuid_str Git-Commit-ID: 81fccd6ca507d3b2012eaf1edeb9b1dbf4bd22db X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 81fccd6ca507d3b2012eaf1edeb9b1dbf4bd22db Gitweb: https://git.kernel.org/tip/81fccd6ca507d3b2012eaf1edeb9b1dbf4bd22db Author: Thomas Richter AuthorDate: Wed, 17 Jan 2018 14:16:11 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 17 Jan 2018 10:31:25 -0300 perf record: Fix failed memory allocation for get_cpuid_str 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 Cc: Heiko Carstens Cc: Hendrik Brueckner Cc: Martin Schwidefsky Link: http://lkml.kernel.org/r/20180117131611.34319-1-tmricht@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 b626d2b..fb0d71a 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c @@ -70,7 +70,7 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused) { 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; }