From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
Leo Yan <leo.yan@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Andi Kleen <ak@linux.intel.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 3/4] perf intel-pt: Smatch: Fix potential NULL pointer dereference
Date: Tue, 9 Jul 2019 14:37:14 +0300 [thread overview]
Message-ID: <13c2a09d-3031-56ea-1c71-39dd8a3c74e8@intel.com> (raw)
In-Reply-To: <20190708215940.GD7455@kernel.org>
On 9/07/19 12:59 AM, Arnaldo Carvalho de Melo wrote:
> Em Mon, Jul 08, 2019 at 10:39:36PM +0800, Leo Yan escreveu:
>> Based on the following report from Smatch, fix the potential
>> NULL pointer dereference check.
>
> Adrian, are you ok now with these two for pt and bts? Can I have your
> acked-by?
Yes they are good. For both:
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
>
> - Arnaldo
>
>> tools/perf/util/intel-pt.c:3200
>> intel_pt_process_auxtrace_info() error: we previously assumed
>> 'session->itrace_synth_opts' could be null (see line 3196)
>>
>> tools/perf/util/intel-pt.c:3206
>> intel_pt_process_auxtrace_info() warn: variable dereferenced before
>> check 'session->itrace_synth_opts' (see line 3200)
>>
>> tools/perf/util/intel-pt.c
>> 3196 if (session->itrace_synth_opts && session->itrace_synth_opts->set) {
>> 3197 pt->synth_opts = *session->itrace_synth_opts;
>> 3198 } else {
>> 3199 itrace_synth_opts__set_default(&pt->synth_opts,
>> 3200 session->itrace_synth_opts->default_no_sample);
>> ^^^^^^^^^^^^^^^^^^^^^^^^^^
>> 3201 if (!session->itrace_synth_opts->default_no_sample &&
>> 3202 !session->itrace_synth_opts->inject) {
>> 3203 pt->synth_opts.branches = false;
>> 3204 pt->synth_opts.callchain = true;
>> 3205 }
>> 3206 if (session->itrace_synth_opts)
>> ^^^^^^^^^^^^^^^^^^^^^^^^^^
>> 3207 pt->synth_opts.thread_stack =
>> 3208 session->itrace_synth_opts->thread_stack;
>> 3209 }
>>
>> 'session->itrace_synth_opts' is impossible to be a NULL pointer in
>> intel_pt_process_auxtrace_info(), thus this patch removes the NULL
>> test for 'session->itrace_synth_opts'.
>>
>> Signed-off-by: Leo Yan <leo.yan@linaro.org>
>> ---
>> tools/perf/util/intel-pt.c | 13 +++++--------
>> 1 file changed, 5 insertions(+), 8 deletions(-)
>>
>> diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
>> index c76a96f777fb..df061599fef4 100644
>> --- a/tools/perf/util/intel-pt.c
>> +++ b/tools/perf/util/intel-pt.c
>> @@ -3210,7 +3210,7 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
>> goto err_delete_thread;
>> }
>>
>> - if (session->itrace_synth_opts && session->itrace_synth_opts->set) {
>> + if (session->itrace_synth_opts->set) {
>> pt->synth_opts = *session->itrace_synth_opts;
>> } else {
>> itrace_synth_opts__set_default(&pt->synth_opts,
>> @@ -3220,8 +3220,7 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
>> pt->synth_opts.branches = false;
>> pt->synth_opts.callchain = true;
>> }
>> - if (session->itrace_synth_opts)
>> - pt->synth_opts.thread_stack =
>> + pt->synth_opts.thread_stack =
>> session->itrace_synth_opts->thread_stack;
>> }
>>
>> @@ -3241,11 +3240,9 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
>> pt->cbr2khz = tsc_freq / pt->max_non_turbo_ratio / 1000;
>> }
>>
>> - if (session->itrace_synth_opts) {
>> - err = intel_pt_setup_time_ranges(pt, session->itrace_synth_opts);
>> - if (err)
>> - goto err_delete_thread;
>> - }
>> + err = intel_pt_setup_time_ranges(pt, session->itrace_synth_opts);
>> + if (err)
>> + goto err_delete_thread;
>>
>> if (pt->synth_opts.calls)
>> pt->branches_filter |= PERF_IP_FLAG_CALL | PERF_IP_FLAG_ASYNC |
>> --
>> 2.17.1
>
next prev parent reply other threads:[~2019-07-09 11:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 14:39 [PATCH v2 0/4] perf: Fix errors detected by Smatch Leo Yan
2019-07-08 14:39 ` [PATCH v2 1/4] perf hists: Smatch: Fix potential NULL pointer dereference Leo Yan
2019-07-13 11:05 ` [tip:perf/urgent] perf hists browser: Fix potential NULL pointer dereference found by the smatch tool tip-bot for Leo Yan
2019-07-08 14:39 ` [PATCH v2 2/4] perf intel-bts: Smatch: Fix potential NULL pointer dereference Leo Yan
2019-07-13 11:08 ` [tip:perf/urgent] perf intel-bts: Fix potential NULL pointer dereference found by the smatch tool tip-bot for Leo Yan
2019-07-08 14:39 ` [PATCH v2 3/4] perf intel-pt: Smatch: Fix potential NULL pointer dereference Leo Yan
2019-07-08 21:59 ` Arnaldo Carvalho de Melo
2019-07-09 11:37 ` Adrian Hunter [this message]
2019-07-13 11:09 ` [tip:perf/urgent] perf intel-pt: Fix potential NULL pointer dereference found by the smatch tool tip-bot for Leo Yan
2019-07-08 14:39 ` [PATCH v2 4/4] perf cs-etm: Smatch: Fix potential NULL pointer dereference Leo Yan
2019-07-08 17:38 ` Mathieu Poirier
2019-07-08 21:57 ` Arnaldo Carvalho de Melo
2019-07-13 11:05 ` [tip:perf/urgent] perf cs-etm: Fix potential NULL pointer dereference found by the smatch tool tip-bot for Leo Yan
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=13c2a09d-3031-56ea-1c71-39dd8a3c74e8@intel.com \
--to=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=arnaldo.melo@gmail.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=namhyung@kernel.org \
--cc=suzuki.poulose@arm.com \
/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;
as well as URLs for NNTP newsgroup(s).