Skip to contentSkip to conversation

uprobes fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jul 25, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest perf/urgent git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2020-07-25

# HEAD: fe5ed7ab99c656bd2f5b79b49df0e9ebf2cead8a uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression

Fix a interaction/regression between uprobes based shared library tracing & GDB.

Thanks,

Ingo

------------------>
Oleg Nesterov (1):
uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression

 kernel/events/uprobes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/uprobes.c +1 -1
index bb0862873dba..5f8b0c52fd2e 100644
@@ -2199,7 +2199,7 @@ static void handle_swbp(struct pt_regs *regs)
 	if (!uprobe) {
 		if (is_swbp > 0) {
 			/* No matching uprobe; signal SIGTRAP. */
-			send_sig(SIGTRAP, current, 0);
+			force_sig(SIGTRAP);
 		} else {
 			/*
 			 * Either we raced with uprobe_unregister() or we can't
merge bot Merged
#1 lore raw
The pull request you sent on Sat, 25 Jul 2020 14:05:40 +0200:

The pull request you sent on Sat, 25 Jul 2020 14:05:40 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2020-07-25

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/78b1afe22d51996c1916a332d43b853ff2b10ade

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker