From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934239AbcIPL6x (ORCPT ); Fri, 16 Sep 2016 07:58:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40348 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755563AbcIPL6v (ORCPT ); Fri, 16 Sep 2016 07:58:51 -0400 Date: Fri, 16 Sep 2016 04:58:01 -0700 From: tip-bot for Alexander Shishkin Message-ID: Cc: eranian@google.com, mingo@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, adrian.hunter@intel.com, hpa@zytor.com, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, torvalds@linux-foundation.org, peterz@infradead.org, acme@infradead.org, linux-kernel@vger.kernel.org, jolsa@redhat.com Reply-To: a.p.zijlstra@chello.nl, tglx@linutronix.de, adrian.hunter@intel.com, eranian@google.com, acme@redhat.com, mingo@kernel.org, torvalds@linux-foundation.org, acme@infradead.org, peterz@infradead.org, linux-kernel@vger.kernel.org, jolsa@redhat.com, hpa@zytor.com, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com In-Reply-To: <20160915151352.21306-2-alexander.shishkin@linux.intel.com> References: <20160915151352.21306-2-alexander.shishkin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel/pt: Fix an off-by-one in address filter configuration Git-Commit-ID: 95f60084acbcee6c466256cf26eb52191fad9edc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 95f60084acbcee6c466256cf26eb52191fad9edc Gitweb: http://git.kernel.org/tip/95f60084acbcee6c466256cf26eb52191fad9edc Author: Alexander Shishkin AuthorDate: Thu, 15 Sep 2016 18:13:50 +0300 Committer: Ingo Molnar CommitDate: Fri, 16 Sep 2016 11:14:16 +0200 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: Adrian Hunter Signed-off-by: Alexander Shishkin Acked-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver 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.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/pt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index 04bb5fb..5ec0100 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -1081,7 +1081,7 @@ static int pt_event_addr_filters_validate(struct list_head *filters) list_for_each_entry(filter, filters, entry) { /* PT doesn't support single address triggers */ - if (!filter->range) + if (!filter->range || !filter->size) return -EOPNOTSUPP; if (!filter->inode && !kernel_ip(filter->offset)) @@ -1111,7 +1111,7 @@ static void pt_event_addr_filters_sync(struct perf_event *event) } else { /* apply the offset */ 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;