aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-05-31 19:26:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-31 20:49:30 -0400
commit2c922c51e6924298f8271d75732964f1ffdecaf2 (patch)
tree7ce86f8702cdf9ad93ad37064654fa21a43f411b /arch/um/kernel
parent137d1a26c842a384c98dd2a6a605014fddf5c777 (diff)
um: properly check all process' threads for a live mm
kill_off_processes() might miss a valid process, this is because checking for process->mm is not enough. Process' main thread may exit or detach its mm via use_mm(), but other threads may still have a valid mm. To catch this we use find_lock_task_mm(), which walks up all threads and returns an appropriate task (with task lock held). Suggested-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> Cc: Richard Weinberger <richard@nod.at> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r--arch/um/kernel/reboot.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index 1411f4e79f9a..3d15243ce692 100644
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -6,6 +6,7 @@
6#include "linux/sched.h" 6#include "linux/sched.h"
7#include "linux/spinlock.h" 7#include "linux/spinlock.h"
8#include "linux/slab.h" 8#include "linux/slab.h"
9#include "linux/oom.h"
9#include "kern_util.h" 10#include "kern_util.h"
10#include "os.h" 11#include "os.h"
11#include "skas.h" 12#include "skas.h"
@@ -25,13 +26,13 @@ static void kill_off_processes(void)
25 26
26 read_lock(&tasklist_lock); 27 read_lock(&tasklist_lock);
27 for_each_process(p) { 28 for_each_process(p) {
28 task_lock(p); 29 struct task_struct *t;
29 if (!p->mm) { 30
30 task_unlock(p); 31 t = find_lock_task_mm(p);
32 if (!t)
31 continue; 33 continue;
32 } 34 pid = t->mm->context.id.u.pid;
33 pid = p->mm->context.id.u.pid; 35 task_unlock(t);
34 task_unlock(p);
35 os_kill_ptraced_process(pid, 1); 36 os_kill_ptraced_process(pid, 1);
36 } 37 }
37 read_unlock(&tasklist_lock); 38 read_unlock(&tasklist_lock);