Merge tag 'perf-urgent-2021-09-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

fec30362 · Linus Torvalds <[email protected]> · 2021-09-19 13:22:40 -07:00

Pull perf event fix from Thomas Gleixner:
 "A single fix for the perf core where a value read with READ_ONCE() was
  checked and then reread which makes all the checks invalid. Reuse the
  already read value instead"

* tag 'perf-urgent-2021-09-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  events: Reuse value read using READ_ONCE instead of re-reading it

Commit: fec3036200b7d9df32c94eb2616447eb2f6e09ac
Parents: f5e29a26 · b89a05b2

Merge commit. Changes below are compared with the first parent: f5e29a26.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/events/core.c	modified	+1	−1	View file

kernel/events/core.c

View file

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 744e872..0c000cb 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10193,7 +10193,7 @@ static void perf_event_addr_filters_apply(struct perf_event *event)
 		return;
 
 	if (ifh->nr_file_filters) {
-		mm = get_task_mm(event->ctx->task);
+		mm = get_task_mm(task);
 		if (!mm)
 			goto restart;
 