Merge tag 'perf-urgent-2026-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

e1f05cd3 · Linus Torvalds <[email protected]> · 2026-08-02 11:32:42 -07:00

Pull uprobes fix from Ingo Molnar:

 - Fix uretprobes race that can crash the kernel (Breno Leitao)

* tag 'perf-urgent-2026-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  uprobes: Fix NULL pointer dereference in hprobe_expire()

Commit: e1f05cd3fc71f14a63015143bf7fa5a7e3731aec
Parents: bd1dde87 · cc679d7a

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

Changes

1 files changed · +1 −1

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

kernel/events/uprobes.c

View file

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 4084e92..6300b21 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -830,7 +830,7 @@ static struct uprobe *hprobe_expire(struct hprobe *hprobe, bool get)
 		if (try_cmpxchg(&hprobe->state, &hstate, uprobe ? HPROBE_STABLE : HPROBE_GONE)) {
 			/* We won the race, we are the ones to unlock SRCU */
 			__srcu_read_unlock(&uretprobes_srcu, hprobe->srcu_idx);
-			return get ? get_uprobe(uprobe) : uprobe;
+			return get && uprobe ? get_uprobe(uprobe) : uprobe;
 		}
 
 		/*