lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.34-rc6' into sched/core

Browse Source
This commit is contained in:
Ingo Molnar
2010-05-07 11:27:54 +02:00
parent 99bd5e2f24 66f41d4c5c
commit 48652ced15
547 changed files with 9333 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/cred.c
View File

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