Skip to contentSkip to conversation

Patch "perf/x86/intel/pt: Fix an off-by-one in address filter configuration" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Sep 22, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-x86-intel-pt-fix-an-off-by-one-in-address-filter-configuration.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 95f60084acbcee6c466256cf26eb52191fad9edc Mon Sep 17 00:00:00 2001

From: Alexander Shishkin <[email protected]>
Date: Thu, 15 Sep 2016 18:13:50 +0300
Subject: perf/x86/intel/pt: Fix an off-by-one in address filter configuration

From: Alexander Shishkin <[email protected]>

commit 95f60084acbcee6c466256cf26eb52191fad9edc upstream.

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.

---
 arch/x86/events/intel/pt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/pt.c +2 -2
@@ -1081,7 +1081,7 @@ static int pt_event_addr_filters_validat
 
 	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(s
 		} 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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/perf-x86-intel-pt-fix-an-off-by-one-in-address-filter-configuration.patch queue-4.7/perf-x86-intel-fix-pebsv3-record-drain.patch queue-4.7/perf-x86-intel-pt-do-validate-the-size-of-a-kernel-address-filter.patch queue-4.7/perf-x86-intel-pt-fix-kernel-address-filter-s-offset-validation.patch