From: Jiri Olsa <jolsa@redhat.com>
To: Jackie Liu <jackieliu2113@gmail.com>
Cc: linux-kernel@vger.kernel.org, Jackie Liu <liuyun01@kylinos.cn>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>
Subject: Re: [PATCH v3] perf tools: perf_event_paranoid and kptr_restrict may crash on 'perf top'
Date: Mon, 15 Mar 2021 13:47:48 +0100 [thread overview]
Message-ID: <YE9XdG1INdboLsbd@krava> (raw)
In-Reply-To: <20210313060246.37116-1-liuyun01@kylinos.cn>
On Sat, Mar 13, 2021 at 02:02:46PM +0800, Jackie Liu wrote:
> After install the libelf-dev package and compiling perf, kptr_restrict=2
> and perf_event_paranoid=3 will cause perf top to crash, because the
> value of /proc/kallsyms cannot be obtained, which leads to
> info->jited_ksyms == NULL. In order to solve this problem, Add a
> judgment before use.
>
> V2->V3:
> free info_linear memory and move code above, don't do those extra btf
> checks.
>
> Suggested-by: Jiri Olsa <jolsa@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
> ---
> tools/perf/util/bpf-event.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> index 57d58c81a5f8..3c03c782bac6 100644
> --- a/tools/perf/util/bpf-event.c
> +++ b/tools/perf/util/bpf-event.c
> @@ -201,12 +201,18 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
> }
seems like the previous check miss free(info_linear) as well?
> info = &info_linear->info;
> + if (!info->jited_ksyms) {
> + free(info_linear);
> + return -1;
> + }
>
> /* number of ksyms, func_lengths, and tags should match */
> sub_prog_cnt = info->nr_jited_ksyms;
> if (sub_prog_cnt != info->nr_prog_tags ||
> - sub_prog_cnt != info->nr_jited_func_lens)
> + sub_prog_cnt != info->nr_jited_func_lens) {
> + free(info_linear);
> return -1;
> + }
>
> /* check BTF func info support */
> if (info->btf_id && info->nr_func_info && info->func_info_rec_size) {
> --
> 2.25.1
>
prev parent reply other threads:[~2021-03-15 12:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-13 6:02 Jackie Liu
2021-03-15 12:47 ` Jiri Olsa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YE9XdG1INdboLsbd@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jackieliu2113@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liuyun01@kylinos.cn \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome