From 35f0841ea03a885e4673376d05367e24b4a731aa Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 25 Jul 2008 01:47:40 -0700
Subject: [PATCH] --- yaml --- r: 105935 b: refs/heads/master c:
 24d5288f06ed8b3a368eba967d587cdb012dfdf7 h: refs/heads/master i:   105933:
 077c22f932251a96e7e4bd0e6a334cbb7d5b44c3   105931:
 abca4923490ecb6878b49a41ba6abeef098f87e3   105927:
 3cde35ad87bc5bd8c7d7f4bb9dd2e1be9c8ce3f2   105919:
 5a10c770edc8bd3a0b23a0877eaf46ac2478853e v: v3

---
 [refs]                      | 2 +-
 trunk/fs/binfmt_elf.c       | 6 ++++++
 trunk/fs/binfmt_elf_fdpic.c | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index be7781806ffe..5eb8ad8e1007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b9f360c0316c06d37c09b02d85565edbaf9dd3
+refs/heads/master: 24d5288f06ed8b3a368eba967d587cdb012dfdf7
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
index 639d2d8b5710..bad7d8770d72 100644
--- a/trunk/fs/binfmt_elf.c
+++ b/trunk/fs/binfmt_elf.c
@@ -1520,6 +1520,9 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
 	rcu_read_lock();
 	do_each_thread(g, p)
 		if (p->mm == dump_task->mm) {
+			if (p->flags & PF_KTHREAD)
+				continue;
+
 			t = kzalloc(offsetof(struct elf_thread_core_info,
 					     notes[info->thread_notes]),
 				    GFP_ATOMIC);
@@ -1724,6 +1727,9 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
 		rcu_read_lock();
 		do_each_thread(g, p)
 			if (current->mm == p->mm && current != p) {
+				if (p->flags & PF_KTHREAD)
+					continue;
+
 				ets = kzalloc(sizeof(*ets), GFP_ATOMIC);
 				if (!ets) {
 					rcu_read_unlock();
diff --git a/trunk/fs/binfmt_elf_fdpic.c b/trunk/fs/binfmt_elf_fdpic.c
index d051a32e6270..71bcc4b4d088 100644
--- a/trunk/fs/binfmt_elf_fdpic.c
+++ b/trunk/fs/binfmt_elf_fdpic.c
@@ -1626,6 +1626,9 @@ static int elf_fdpic_core_dump(long signr, struct pt_regs *regs,
 		rcu_read_lock();
 		do_each_thread(g,p)
 			if (current->mm == p->mm && current != p) {
+				if (p->flags & PF_KTHREAD)
+					continue;
+
 				tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC);
 				if (!tmp) {
 					rcu_read_unlock();