From: Jiri Olsa <jolsa@redhat.com>
To: Andi Kleen <andi@firstfloor.org>
Cc: acme@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH v1 01/15] perf, tools, stat: Fix buffer overflow while freeing events
Date: Tue, 1 Aug 2017 10:11:21 +0200 [thread overview]
Message-ID: <20170801081121.GA7799@krava> (raw)
In-Reply-To: <20170724234015.5165-2-andi@firstfloor.org>
On Mon, Jul 24, 2017 at 04:40:01PM -0700, Andi Kleen wrote:
SNIP
>
> The event is allocated with cpus == 1, but freed with cpus == real number
> When the evsel close function walks the file descriptors it exceeds the
> fd xyarray boundaries and reads random memory.
>
> Just make sure to always use the same dummy cpu map following
> the same logic as the open call.
>
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
> tools/perf/builtin-stat.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 48ac53b199fc..97d6b6c42014 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -715,6 +715,8 @@ static int __run_perf_stat(int argc, const char **argv)
> * group leaders.
> */
> read_counters();
> + if (!target__has_cpu(&target))
> + evsel_list->cpus = cpu_map__dummy_new();
you're leaking evsel_list->cpus right here..
I can see there's the issue when we mix system_wide event
(with cpumask defined) and normal event:
- we open such group as per_thread events (not system_wide),
forcing both evsel->fd xyarray to be allocated from dummy
cpus (with ncpus == 1)
- but when we call perf_evlist__close we take ncpus from
int n = evsel->cpus ? evsel->cpus->nr : ncpus;
which is wrong for system_wide event and will
cause the xyarray out of bounds access
I can see the solution either in:
1) keeping the bounds for xyarray in it and use it for iterations
2) or forcing system_wide target if there's single system_wide event
specified (patch below)
but not sure there's any sense in meassuting system_wide
event in non system_wide mode (ad 1).. thoughts?
thanks,
jirka
---
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 866da7aa54bf..9ccb4d671568 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -2540,8 +2540,8 @@ static void setup_system_wide(int forks)
* conditions is met:
*
* - there's no workload specified
- * - there is workload specified but all requested
- * events are system wide events
+ * - there is workload specified and one
+ * of the events is system wide
*/
if (!target__none(&target))
return;
@@ -2552,12 +2552,11 @@ static void setup_system_wide(int forks)
struct perf_evsel *counter;
evlist__for_each_entry(evsel_list, counter) {
- if (!counter->system_wide)
+ if (counter->system_wide) {
+ target.system_wide = true;
return;
+ }
}
-
- if (evsel_list->nr_entries)
- target.system_wide = true;
}
}
next prev parent reply other threads:[~2017-08-01 8:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 23:40 Support standalone metrics and metric groups for perf Andi Kleen
2017-07-24 23:40 ` [PATCH v1 01/15] perf, tools, stat: Fix buffer overflow while freeing events Andi Kleen
2017-08-01 8:11 ` Jiri Olsa [this message]
2017-07-24 23:40 ` [PATCH v1 02/15] perf, tools: Tighten detection of BPF events Andi Kleen
2017-08-02 7:35 ` Jiri Olsa
2017-08-02 19:10 ` Arnaldo Carvalho de Melo
2017-07-24 23:40 ` [PATCH v1 03/15] perf, tools, stat: Fix saved values rbtree lookup Andi Kleen
2017-08-02 7:35 ` Jiri Olsa
2017-08-02 19:11 ` Arnaldo Carvalho de Melo
2017-08-14 17:43 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2017-07-24 23:40 ` [PATCH v1 04/15] perf, tools: Support weak groups Andi Kleen
2017-08-02 7:35 ` Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 05/15] perf, tools: Add missing newline to expr parser error messages Andi Kleen
2017-08-02 7:37 ` Jiri Olsa
2017-08-14 17:44 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2017-07-24 23:40 ` [PATCH v1 06/15] perf, tools: Add utility function to detect SMT status Andi Kleen
2017-07-24 23:40 ` [PATCH v1 07/15] perf, tools: Expression parser enhancements for metrics Andi Kleen
2017-08-07 9:51 ` Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 08/15] perf, tools: Increase maximum number of events in expressions Andi Kleen
2017-07-24 23:40 ` [PATCH v1 09/15] perf, tools: Dedup events in expression parsing Andi Kleen
2017-08-07 9:51 ` Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 10/15] perf, tools: Support metric_group and no event name in json parser Andi Kleen
2017-07-24 23:40 ` [PATCH v1 11/15] perf, tools, stat: Factor out generic metric printing Andi Kleen
2017-07-24 23:40 ` [PATCH v1 12/15] perf, tools, stat: Support JSON metrics in perf stat Andi Kleen
2017-07-24 23:40 ` [PATCH v1 13/15] perf, tools, list: Add metric groups to perf list Andi Kleen
2017-07-24 23:40 ` [PATCH v1 14/15] perf, tools, stat: Don't use ctx for saved values lookup Andi Kleen
2017-07-24 23:40 ` [PATCH v1 15/15] perf, tools: Support duration_time Andi Kleen
2017-08-07 10:36 ` Jiri Olsa
2017-07-26 14:15 ` Support standalone metrics and metric groups for perf Jiri Olsa
2017-07-26 15:38 ` Andi Kleen
2017-07-28 8:48 ` Jiri Olsa
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=20170801081121.GA7799@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).