aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cred.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-05-12 19:20:04 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-05-12 19:20:04 -0400
commit1540c84b5ed657ed71dce06915bba461e6b09574 (patch)
treea449dc166800a1b0c429bb038bfc974e577eaf72 /kernel/cred.c
parent1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff)
parent4640b4e7d9919e9629fe8456df94f71658431ef9 (diff)
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts: Makefile Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/cred.c')
-rw-r--r--kernel/cred.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/cred.c b/kernel/cred.c
index 1ed8ca18790c..099f5e6fb94c 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -786,8 +786,6 @@ bool creds_are_invalid(const struct cred *cred)
786{ 786{
787 if (cred->magic != CRED_MAGIC) 787 if (cred->magic != CRED_MAGIC)
788 return true; 788 return true;
789 if (atomic_read(&cred->usage) < atomic_read(&cred->subscribers))
790 return true;
791#ifdef CONFIG_SECURITY_SELINUX 789#ifdef CONFIG_SECURITY_SELINUX
792 if (selinux_is_enabled()) { 790 if (selinux_is_enabled()) {
793 if ((unsigned long) cred->security < PAGE_SIZE) 791 if ((unsigned long) cred->security < PAGE_SIZE)