From 1cfab7373cbc9fb9ef9bed60749407bff2eb2634 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 26 May 2010 14:43:07 -0700 Subject: [PATCH] --- yaml --- r: 198746 b: refs/heads/master c: 5e43aef530ba39206f7923295388f7ec3c5a7d93 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/exec.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 3a270dafb324..c2ff9dc8cfc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5bf4c4f5f9dcc90b7e25dbb2f7c4436cf6e7ed0 +refs/heads/master: 5e43aef530ba39206f7923295388f7ec3c5a7d93 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 1221c4c43547..6501823b7a1b 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -1862,10 +1862,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) goto fail; cred = prepare_creds(); - if (!cred) { - retval = -ENOMEM; + if (!cred) goto fail; - } down_write(&mm->mmap_sem); /* @@ -1873,8 +1871,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) */ if (mm->core_state || !__get_dumpable(cprm.mm_flags)) { up_write(&mm->mmap_sem); - put_cred(cred); - goto fail; + goto fail_creds; } /* @@ -1889,10 +1886,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) } retval = coredump_wait(exit_code, &core_state); - if (retval < 0) { - put_cred(cred); - goto fail; - } + if (retval < 0) + goto fail_creds; old_cred = override_creds(cred); @@ -2009,9 +2004,10 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) if (ispipe) atomic_dec(&core_dump_count); fail_unlock: + coredump_finish(mm); revert_creds(old_cred); +fail_creds: put_cred(cred); - coredump_finish(mm); fail: return; }