[PATCH 1/2] do_coredump: factor out put_cred() calls

From: Oleg Nesterov
Date: Fri Jun 26 2009 - 18:30:04 EST


Given that do_coredump() calls put_cred() on exit path, it is a bit ugly
to do put_cred() + "goto fail" twice, just add the new "fail_creds" label.

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>

--- WAIT/fs/exec.c~CD_1_PUT_CRED 2009-06-15 12:48:28.000000000 +0200
+++ WAIT/fs/exec.c 2009-06-26 20:06:01.000000000 +0200
@@ -1732,13 +1732,11 @@ void do_coredump(long signr, int exit_co

binfmt = current->binfmt;
if (!binfmt || !binfmt->core_dump)
- goto fail;
+ goto out;

cred = prepare_creds();
- if (!cred) {
- retval = -ENOMEM;
- goto fail;
- }
+ if (!cred)
+ goto out;

down_write(&mm->mmap_sem);
/*
@@ -1746,8 +1744,7 @@ void do_coredump(long signr, int exit_co
*/
if (mm->core_state || !get_dumpable(mm)) {
up_write(&mm->mmap_sem);
- put_cred(cred);
- goto fail;
+ goto fail_creds;
}

/*
@@ -1761,10 +1758,8 @@ void do_coredump(long signr, int exit_co
}

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);

@@ -1862,9 +1857,10 @@ fail_unlock:
if (helper_argv)
argv_free(helper_argv);

+ coredump_finish(mm);
revert_creds(old_cred);
+fail_creds:
put_cred(cred);
- coredump_finish(mm);
-fail:
+out:
return;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/