Skip to contentSkip to conversation

Patch "perf/x86/intel/pt: Do validate the size of a kernel address filter" 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: Do validate the size of a kernel address filter

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-do-validate-the-size-of-a-kernel-address-filter.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 1155bafcb79208abc6ae234c6e135ac70607755c Mon Sep 17 00:00:00 2001

From: Alexander Shishkin <[email protected]>
Date: Thu, 15 Sep 2016 18:13:52 +0300
Subject: perf/x86/intel/pt: Do validate the size of a kernel address filter

From: Alexander Shishkin <[email protected]>

commit 1155bafcb79208abc6ae234c6e135ac70607755c upstream.

Right now, the kernel address filters in PT are prone to integer overflow that may happen in adding filter's size to its offset to obtain the end of the range. Such an overflow would also throw a #GP in the PT event configuration path.

Fix this by explicitly validating the result of this calculation.

---
 arch/x86/events/intel/pt.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/events/intel/pt.c +7 -2
@@ -1089,8 +1089,13 @@ static int pt_event_addr_filters_validat
 		if (!filter->range || !filter->size)
 			return -EOPNOTSUPP;
 
-		if (!filter->inode && !valid_kernel_ip(filter->offset))
-			return -EINVAL;
+		if (!filter->inode) {
+			if (!valid_kernel_ip(filter->offset))
+				return -EINVAL;
+
+			if (!valid_kernel_ip(filter->offset + filter->size))
+				return -EINVAL;
+		}
 
 		if (++range > pt_cap_get(PT_CAP_num_address_ranges))
 			return -EOPNOTSUPP;

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