[PATCH] bugfix oom kill init lead panic

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: chenjie <chenjie6@xxxxxxxxxx>

when oom happened we can see:
Out of memory: Kill process 9134 (init) score 3 or sacrifice child                  
Killed process 9134 (init) total-vm:1868kB, anon-rss:84kB, file-rss:572kB
Kill process 1 (init) sharing same memory
...
Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000009

That's because:
	the busybox init will vfork a process,oom_kill_process found
the init not the children,their mm is the same when vfork.

Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Chen Jie <chenjie6@xxxxxxxxxx>

---
 mm/oom_kill.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 4d87d7c..de77cbc 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -513,7 +513,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 	rcu_read_lock();
 	for_each_process(p)
 		if (p->mm == mm && !same_thread_group(p, victim) &&
-		    !(p->flags & PF_KTHREAD)) {
+		    !(p->flags & PF_KTHREAD) && !is_global_init(p)) {
 			if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
 				continue;
 
-- 
1.8.0

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]