aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/exec.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 6501823b7a1b..0c72d23ed0e2 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1662,12 +1662,15 @@ static int coredump_wait(int exit_code, struct core_state *core_state)
1662 struct task_struct *tsk = current; 1662 struct task_struct *tsk = current;
1663 struct mm_struct *mm = tsk->mm; 1663 struct mm_struct *mm = tsk->mm;
1664 struct completion *vfork_done; 1664 struct completion *vfork_done;
1665 int core_waiters; 1665 int core_waiters = -EBUSY;
1666 1666
1667 init_completion(&core_state->startup); 1667 init_completion(&core_state->startup);
1668 core_state->dumper.task = tsk; 1668 core_state->dumper.task = tsk;
1669 core_state->dumper.next = NULL; 1669 core_state->dumper.next = NULL;
1670 core_waiters = zap_threads(tsk, mm, core_state, exit_code); 1670
1671 down_write(&mm->mmap_sem);
1672 if (!mm->core_state)
1673 core_waiters = zap_threads(tsk, mm, core_state, exit_code);
1671 up_write(&mm->mmap_sem); 1674 up_write(&mm->mmap_sem);
1672 1675
1673 if (unlikely(core_waiters < 0)) 1676 if (unlikely(core_waiters < 0))
@@ -1860,20 +1863,12 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
1860 binfmt = mm->binfmt; 1863 binfmt = mm->binfmt;
1861 if (!binfmt || !binfmt->core_dump) 1864 if (!binfmt || !binfmt->core_dump)
1862 goto fail; 1865 goto fail;
1866 if (!__get_dumpable(cprm.mm_flags))
1867 goto fail;
1863 1868
1864 cred = prepare_creds(); 1869 cred = prepare_creds();
1865 if (!cred) 1870 if (!cred)
1866 goto fail; 1871 goto fail;
1867
1868 down_write(&mm->mmap_sem);
1869 /*
1870 * If another thread got here first, or we are not dumpable, bail out.
1871 */
1872 if (mm->core_state || !__get_dumpable(cprm.mm_flags)) {
1873 up_write(&mm->mmap_sem);
1874 goto fail_creds;
1875 }
1876
1877 /* 1872 /*
1878 * We cannot trust fsuid as being the "true" uid of the 1873 * We cannot trust fsuid as being the "true" uid of the
1879 * process nor do we know its entire history. We only know it 1874 * process nor do we know its entire history. We only know it