提交 95f60084 编写于 作者: A Alexander Shishkin 提交者: Ingo Molnar

perf/x86/intel/pt: Fix an off-by-one in address filter configuration

PT address filter configuration requires that a range is specified by
its first and last address, but at the moment we're obtaining the end
of the range by adding user specified size to its start, which is off
by one from what it actually needs to be.

Fix this and make sure that zero-sized filters don't pass the filter
validation.
Reported-by: NAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: NAlexander Shishkin <alexander.shishkin@linux.intel.com>
Acked-by: NPeter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: stable@vger.kernel.org # v4.7
Cc: stable@vger.kernel.org#v4.7
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/20160915151352.21306-2-alexander.shishkin@linux.intel.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 cecf6235
...@@ -1081,7 +1081,7 @@ static int pt_event_addr_filters_validate(struct list_head *filters) ...@@ -1081,7 +1081,7 @@ static int pt_event_addr_filters_validate(struct list_head *filters)
list_for_each_entry(filter, filters, entry) { list_for_each_entry(filter, filters, entry) {
/* PT doesn't support single address triggers */ /* PT doesn't support single address triggers */
if (!filter->range) if (!filter->range || !filter->size)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!filter->inode && !kernel_ip(filter->offset)) if (!filter->inode && !kernel_ip(filter->offset))
...@@ -1111,7 +1111,7 @@ static void pt_event_addr_filters_sync(struct perf_event *event) ...@@ -1111,7 +1111,7 @@ static void pt_event_addr_filters_sync(struct perf_event *event)
} else { } else {
/* apply the offset */ /* apply the offset */
msr_a = filter->offset + offs[range]; msr_a = filter->offset + offs[range];
msr_b = filter->size + msr_a; msr_b = filter->size + msr_a - 1;
} }
filters->filter[range].msr_a = msr_a; filters->filter[range].msr_a = msr_a;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册