2 files changed, 9 insertions, 0 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 639d2d8b5710..bad7d8770d72 100644
--- a/fs/binfmt_elf.c
+++ b/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/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index d051a32e6270..71bcc4b4d088 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/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();