| 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
| ||
|
Message-ID: <Z9TT3tGq4TJ76Tm9@google.com>
Date: Fri, 14 Mar 2025 18:11:58 -0700
From: Namhyung Kim <namhyung@...nel.org>
To: Ian Rogers <irogers@...gle.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>,
Adrian Hunter <adrian.hunter@...el.com>,
Kan Liang <kan.liang@...ux.intel.com>,
Yunseong Kim <yskelg@...il.com>,
James Clark <james.clark@...aro.org>,
linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org,
Arnaldo Carvalho de Melo <acme@...hat.com>,
Andi Kleen <ak@...ux.intel.com>,
Charlie Jenkins <charlie@...osinc.com>,
John Garry <john.g.garry@...cle.com>, Leo Yan <leo.yan@...ux.dev>,
Michael Petlan <mpetlan@...hat.com>,
Tavian Barnes <tavianator@...ianator.com>,
Veronika Molnarova <vmolnaro@...hat.com>,
coresight@...ts.linaro.org, linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH v2] perf libunwind: Fixup conversion
perf_sample->user_regs to a pointer
On Wed, Mar 12, 2025 at 08:31:21PM -0700, Ian Rogers wrote:
> From: Arnaldo Carvalho de Melo <acme@...hat.com>
>
> The dc6d2bc2d893a878 ("perf sample: Make user_regs and intr_regs optional") misses
> the changes to a file, resulting in this problem:
>
> $ make LIBUNWIND=1 -C tools/perf O=/tmp/build/perf-tools-next install-bin
> <SNIP>
> CC /tmp/build/perf-tools-next/util/unwind-libunwind-local.o
> CC /tmp/build/perf-tools-next/util/unwind-libunwind.o
> <SNIP>
> util/unwind-libunwind-local.c: In function ‘access_mem’:
> util/unwind-libunwind-local.c:582:56: error: ‘ui->sample->user_regs’ is a pointer; did you mean to use ‘->’?
> 582 | if (__write || !stack || !ui->sample->user_regs.regs) {
> | ^
> | ->
> util/unwind-libunwind-local.c:587:38: error: passing argument 2 of ‘perf_reg_value’ from incompatible pointer type [-Wincompatible-pointer-types]
> 587 | ret = perf_reg_value(&start, &ui->sample->user_regs,
> | ^~~~~~~~~~~~~~~~~~~~~~
> | |
> | struct regs_dump **
> <SNIP>
> ⬢ [acme@...lbox perf-tools-next]$ git bisect bad
> dc6d2bc2d893a878e7b58578ff01b4738708deb4 is the first bad commit
> commit dc6d2bc2d893a878e7b58578ff01b4738708deb4 (HEAD)
> Author: Ian Rogers <irogers@...gle.com>
> Date: Mon Jan 13 11:43:45 2025 -0800
>
> perf sample: Make user_regs and intr_regs optional
>
> Detected using:
>
> make -C tools/perf build-test
>
> Fixes: dc6d2bc2d893a878 ("perf sample: Make user_regs and intr_regs optional")
> Cc: Adrian Hunter <adrian.hunter@...el.com>
> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
> Cc: Andi Kleen <ak@...ux.intel.com>
> Cc: Charlie Jenkins <charlie@...osinc.com>
> Cc: Ian Rogers <irogers@...gle.com>
> Cc: Ingo Molnar <mingo@...hat.com>
> Cc: James Clark <james.clark@...aro.org>
> Cc: John Garry <john.g.garry@...cle.com>
> Cc: Kan Liang <kan.liang@...ux.intel.com>
> Cc: Leo Yan <leo.yan@...ux.dev>
> Cc: Mark Rutland <mark.rutland@....com>
> Cc: Michael Petlan <mpetlan@...hat.com>
> Cc: Namhyung Kim <namhyung@...nel.org>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Tavian Barnes <tavianator@...ianator.com>
> Cc: Veronika Molnarova <vmolnaro@...hat.com>
> Cc: coresight@...ts.linaro.org
> Cc: linux-arm-kernel@...ts.infradead.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
> Reviewed-by: Ian Rogers <irogers@...gle.com>
I think you need to add your own Signed-off-by in this case.
I'll change it for you, ok?
Thanks,
Namhyung
> ---
> v2: Ensure user_regs isn't NULL when read, spotted by Namhyung.
> ---
> tools/perf/util/unwind-libunwind-local.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c
> index 16c2b03831f3..5f4387e2423a 100644
> --- a/tools/perf/util/unwind-libunwind-local.c
> +++ b/tools/perf/util/unwind-libunwind-local.c
> @@ -579,12 +579,12 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
> int ret;
>
> /* Don't support write, probably not needed. */
> - if (__write || !stack || !ui->sample->user_regs.regs) {
> + if (__write || !stack || !ui->sample->user_regs || !ui->sample->user_regs->regs) {
> *valp = 0;
> return 0;
> }
>
> - ret = perf_reg_value(&start, &ui->sample->user_regs,
> + ret = perf_reg_value(&start, perf_sample__user_regs(ui->sample),
> perf_arch_reg_sp(arch));
> if (ret)
> return ret;
> @@ -628,7 +628,7 @@ static int access_reg(unw_addr_space_t __maybe_unused as,
> return 0;
> }
>
> - if (!ui->sample->user_regs.regs) {
> + if (!ui->sample->user_regs || !ui->sample->user_regs->regs) {
> *valp = 0;
> return 0;
> }
> @@ -637,7 +637,7 @@ static int access_reg(unw_addr_space_t __maybe_unused as,
> if (id < 0)
> return -EINVAL;
>
> - ret = perf_reg_value(&val, &ui->sample->user_regs, id);
> + ret = perf_reg_value(&val, perf_sample__user_regs(ui->sample), id);
> if (ret) {
> if (!ui->best_effort)
> pr_err("unwind: can't read reg %d\n", regnum);
> @@ -741,7 +741,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
> unw_cursor_t c;
> int ret, i = 0;
>
> - ret = perf_reg_value(&val, &ui->sample->user_regs,
> + ret = perf_reg_value(&val, perf_sample__user_regs(ui->sample),
> perf_arch_reg_ip(arch));
> if (ret)
> return ret;
> @@ -808,7 +808,7 @@ static int _unwind__get_entries(unwind_entry_cb_t cb, void *arg,
> .best_effort = best_effort
> };
>
> - if (!data->user_regs.regs)
> + if (!data->user_regs || !data->user_regs->regs)
> return -EINVAL;
>
> if (max_stack <= 0)
> --
> 2.49.0.rc0.332.g42c0ae87b1-goog
>
Powered by blists - more mailing lists