diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:27:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:27:54 +0200 |
| commit | 48652ced1533c3372f996a0d83b6e73b1f1c9381 (patch) | |
| tree | 5e17729cfcdc97bf798a17b57cdb888b4ded65b0 /kernel/cred.c | |
| parent | sched: Fix select_idle_sibling() logic in select_task_rq_fair() (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | linux-48652ced1533c3372f996a0d83b6e73b1f1c9381.tar.xz linux-48652ced1533c3372f996a0d83b6e73b1f1c9381.zip | |
Merge commit 'v2.6.34-rc6' into sched/core
Diffstat (limited to 'kernel/cred.c')
| -rw-r--r-- | kernel/cred.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 4f483be5944c..8f3672a58a1e 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -397,6 +397,8 @@ struct cred *prepare_usermodehelper_creds(void) error: put_cred(new); + return NULL; + free_tgcred: #ifdef CONFIG_KEYS kfree(tgcred); @@ -788,8 +790,6 @@ bool creds_are_invalid(const struct cred *cred) { if (cred->magic != CRED_MAGIC) return true; - if (atomic_read(&cred->usage) < atomic_read(&cred->subscribers)) - return true; #ifdef CONFIG_SECURITY_SELINUX if (selinux_is_enabled()) { if ((unsigned long) cred->security < PAGE_SIZE) |