mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
perf script: Check session->header.env.arch before using it
commit 29c77550ee
upstream.
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.
Committer notes:
If it is a pipe, we already assume is a native arch, so no need to check
session->header.env.arch.
Signed-off-by: Song Liu <songliubraving@fb.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-team@fb.com
Cc: stable@vger.kernel.org
Link: http://lore.kernel.org/lkml/20211004053238.514936-1-songliubraving@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6f416815c5
commit
fbb91dadb5
1 changed files with 8 additions and 4 deletions
|
@ -3820,11 +3820,15 @@ 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;
|
||||
} else 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);
|
||||
|
|
Loading…
Reference in a new issue