[lkml]   [2018]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[GIT PULL] Uprobes: Fix kernel oops with delayed_uprobe_remove()


This is a single commit that fixes a bug in uprobes SDT code
due to a missing mutex protection.

Please pull the latest trace-v4.20-rc5 tree, which can be found at:


Tag SHA1: a5405a88026387f237d97b607234db71d91c13e2
Head SHA1: 1aed58e67a6ec1e7a18bfabe8ba6ec2d27c15636

Ravi Bangoria (1):
Uprobes: Fix kernel oops with delayed_uprobe_remove()

kernel/events/uprobes.c | 2 ++
1 file changed, 2 insertions(+)
commit 1aed58e67a6ec1e7a18bfabe8ba6ec2d27c15636
Author: Ravi Bangoria <>
Date: Wed Dec 5 09:04:23 2018 +0530

Uprobes: Fix kernel oops with delayed_uprobe_remove()

There could be a race between task exit and probe unregister:

__mmput() uprobe_unregister()
uprobe_clear_state() put_uprobe()
delayed_uprobe_remove() delayed_uprobe_remove()

put_uprobe() is calling delayed_uprobe_remove() without taking
delayed_uprobe_lock and thus the race sometimes results in a
kernel crash. Fix this by taking delayed_uprobe_lock before
calling delayed_uprobe_remove() from put_uprobe().

Detailed crash log can be found at:


Acked-by: Oleg Nesterov <>
Reviewed-by: Srikar Dronamraju <>
Fixes: 1cc33161a83d ("uprobes: Support SDT markers having reference count (semaphore)")
Signed-off-by: Ravi Bangoria <>
Signed-off-by: Steven Rostedt (VMware) <>

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 96d4bee83489..98b9312ce6b2 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -572,7 +572,9 @@ static void put_uprobe(struct uprobe *uprobe)
* gets called, we don't get a chance to remove uprobe from
* delayed_uprobe_list from remove_breakpoint(). Do it here.
+ mutex_lock(&delayed_uprobe_lock);
delayed_uprobe_remove(uprobe, NULL);
+ mutex_unlock(&delayed_uprobe_lock);
 \ /
  Last update: 2018-12-06 18:48    [W:0.046 / U:3.968 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site