diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-07-25 04:47:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:39 -0400 |
commit | 24d5288f06ed8b3a368eba967d587cdb012dfdf7 (patch) | |
tree | 77844e275f2e3bcdc64427e64633e82f0207476d | |
parent | 15b9f360c0316c06d37c09b02d85565edbaf9dd3 (diff) |
coredump: elf_core_dump: skip kernel threads
linux_binfmt->core_dump() runs before the process does exit_aio(), this
means that we can hit the kernel thread which shares the same ->mm.
Afaics, nothing really bad can happen, but perhaps it makes sense to fix
this minor bug.
It is sad we have to iterate over all threads in system and use
GFP_ATOMIC. Hopefully we can kill theses ugly do_each_thread()s, but this
needs some nontrivial changes in mm_struct and do_coredump.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/binfmt_elf.c | 6 | ||||
-rw-r--r-- | fs/binfmt_elf_fdpic.c | 3 |
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, | |||
1520 | rcu_read_lock(); | 1520 | rcu_read_lock(); |
1521 | do_each_thread(g, p) | 1521 | do_each_thread(g, p) |
1522 | if (p->mm == dump_task->mm) { | 1522 | if (p->mm == dump_task->mm) { |
1523 | if (p->flags & PF_KTHREAD) | ||
1524 | continue; | ||
1525 | |||
1523 | t = kzalloc(offsetof(struct elf_thread_core_info, | 1526 | t = kzalloc(offsetof(struct elf_thread_core_info, |
1524 | notes[info->thread_notes]), | 1527 | notes[info->thread_notes]), |
1525 | GFP_ATOMIC); | 1528 | GFP_ATOMIC); |
@@ -1724,6 +1727,9 @@ static int fill_note_info(struct elfhdr *elf, int phdrs, | |||
1724 | rcu_read_lock(); | 1727 | rcu_read_lock(); |
1725 | do_each_thread(g, p) | 1728 | do_each_thread(g, p) |
1726 | if (current->mm == p->mm && current != p) { | 1729 | if (current->mm == p->mm && current != p) { |
1730 | if (p->flags & PF_KTHREAD) | ||
1731 | continue; | ||
1732 | |||
1727 | ets = kzalloc(sizeof(*ets), GFP_ATOMIC); | 1733 | ets = kzalloc(sizeof(*ets), GFP_ATOMIC); |
1728 | if (!ets) { | 1734 | if (!ets) { |
1729 | rcu_read_unlock(); | 1735 | 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, | |||
1626 | rcu_read_lock(); | 1626 | rcu_read_lock(); |
1627 | do_each_thread(g,p) | 1627 | do_each_thread(g,p) |
1628 | if (current->mm == p->mm && current != p) { | 1628 | if (current->mm == p->mm && current != p) { |
1629 | if (p->flags & PF_KTHREAD) | ||
1630 | continue; | ||
1631 | |||
1629 | tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC); | 1632 | tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC); |
1630 | if (!tmp) { | 1633 | if (!tmp) { |
1631 | rcu_read_unlock(); | 1634 | rcu_read_unlock(); |