Re: [PATCH] perf record: Fix failed memory allocation for get_cpuid_str

From: Arnaldo Carvalho de Melo
Date: Wed Jan 17 2018 - 08:32:17 EST


Em Wed, Jan 17, 2018 at 02:16:11PM +0100, Thomas Richter escreveu:
> 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.

Thanks, applied.

- Arnaldo

> Signed-off-by: Thomas Richter <tmricht@xxxxxxxxxxxxxxxxxx>
> ---
> 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 33027c5e6f92..c6b5204e0280 100644
> --- a/tools/perf/arch/x86/util/header.c
> +++ b/tools/perf/arch/x86/util/header.c
> @@ -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;
> }
> --
> 2.13.4