mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge commit 'v2.6.34-rc6' into sched/core
This commit is contained in:
commit
48652ced15
547 changed files with 9317 additions and 3944 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue