---

yaml --- r: 320473 b: refs/heads/master c: 2fd611a h: refs/heads/master i: 320471: 859b81a v: v3
git-mirror · Jul 30, 2012 · 91d8e66 · 91d8e66
1 parent c5edb0f
commit 91d8e66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 665605a2a207dbe1fa429b474f932d6ea138ba92
+refs/heads/master: 2fd611a991391a6050cbd139201a2e12fc306540
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
@@ -1082,6 +1082,9 @@ void uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned lon
 	if (!atomic_read(&uprobe_events) || !valid_vma(vma, false))
 		return;
 
+	if (!atomic_read(&vma->vm_mm->mm_users)) /* called by mmput() ? */
+		return;
+
 	if (!atomic_read(&vma->vm_mm->uprobes_state.count))
 		return;
-Original file line number
+Diff line change
@@ Expand Up @@
     	if (!atomic_read(&uprobe_events) || !valid_vma(vma, false))
     		return;
+    	if (!atomic_read(&vma->vm_mm->mm_users)) /* called by mmput() ? */
+    		return;
     	if (!atomic_read(&vma->vm_mm->uprobes_state.count))
     		return;
@@ Expand Down @@