Skip to contentSkip to conversation

Patch "perf/core: Fix address filter parser" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 29, 2016

Subsystems (2)
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/core: Fix address filter parser

to the 4.8-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-core-fix-address-filter-parser.patch
and it can be found in the queue-4.8 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 e96271f3ed7e702fa36dd0605c0c5b5f065af816 Mon Sep 17 00:00:00 2001

From: Alexander Shishkin <[email protected]>
Date: Fri, 18 Nov 2016 13:38:43 +0200
Subject: perf/core: Fix address filter parser

From: Alexander Shishkin <[email protected]>

commit e96271f3ed7e702fa36dd0605c0c5b5f065af816 upstream.

The token table passed into match_token() must be null-terminated, which it currently is not in the perf's address filter string parser, as caught by Vince's perf_fuzzer and KASAN.

It doesn't blow up otherwise because of the alignment padding of the table to the next element in the .rodata, which is luck.

Fixing by adding a null-terminator to the token table.

---
 kernel/events/core.c |    2 ++
 1 file changed, 2 insertions(+)
kernel/events/core.c +2 -0
@@ -7908,6 +7908,7 @@ restart:
  * if <size> is not specified, the range is treated as a single address.
  */
 enum {
+	IF_ACT_NONE = -1,
 	IF_ACT_FILTER,
 	IF_ACT_START,
 	IF_ACT_STOP,
@@ -7931,6 +7932,7 @@ static const match_table_t if_tokens = {
 	{ IF_SRC_KERNEL,	"%u/%u" },
 	{ IF_SRC_FILEADDR,	"%u@%s" },
 	{ IF_SRC_KERNELADDR,	"%u" },
+	{ IF_ACT_NONE,		NULL },
 };
 
 /*

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

queue-4.8/perf-x86-intel-cure-bogus-unwind-from-pebs-entries.patch queue-4.8/perf-core-fix-address-filter-parser.patch