linux-kernel - Re: [PATCH] perf-script: check session->header.env.arch before using it

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <18D8F9F1-BF41-4C60-899B-53F6ED76FB2B@fb.com>
Date:   Sat, 16 Oct 2021 00:59:17 +0000
From:   Song Liu <songliubraving@...com>
To:     LKML <linux-kernel@...r.kernel.org>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Arnaldo Carvalho de Melo <acme@...hat.com>
CC:     Kernel Team <Kernel-team@...com>,
        Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>, stable <stable@...r.kernel.org>
Subject: Re: [PATCH] perf-script: check session->header.env.arch before using
 it

Hi Arnaldo, 

Could you please share your comments on this one?

Thanks,
Song

> On Oct 3, 2021, at 10:32 PM, Song Liu <songliubraving@...com> wrote:
> 
> When perf.data is not written cleanly, we would like to process existing
> data as much as possible (please see f_header.data.size == 0 condition
> in perf_session__read_header). However, perf.data with partial data may
> crash perf. Specifically, we see crash in perf-script for NULL
> session->header.env.arch.
> 
> Fix this by checking session->header.env.arch before using it to determine
> native_arch. Also split the if condition so it is easier to read.
> 
> Cc: stable@...r.kernel.org
> Signed-off-by: Song Liu <songliubraving@...com>
> ---
> tools/perf/builtin-script.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> index 6211d0b84b7a6..7821f6740ac1d 100644
> --- a/tools/perf/builtin-script.c
> +++ b/tools/perf/builtin-script.c
> @@ -4039,12 +4039,17 @@ int cmd_script(int argc, const char **argv)
> 		goto out_delete;
> 
> 	uname(&uts);
> -	if (data.is_pipe ||  /* assume pipe_mode indicates native_arch */
> -	    !strcmp(uts.machine, session->header.env.arch) ||
> -	    (!strcmp(uts.machine, "x86_64") &&
> -	     !strcmp(session->header.env.arch, "i386")))
> +	if (data.is_pipe)  /* assume pipe_mode indicates native_arch */
> 		native_arch = true;
> 
> +	if (session->header.env.arch) {
> +		if (!strcmp(uts.machine, session->header.env.arch))
> +			native_arch = true;
> +		else if (!strcmp(uts.machine, "x86_64") &&
> +			 !strcmp(session->header.env.arch, "i386"))
> +			native_arch = true;
> +	}
> +
> 	script.session = session;
> 	script__setup_sample_type(&script);
> 
> -- 
> 2.30.2
>