aboutsummaryrefslogtreecommitdiff
path: root/security/selinux/hooks.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-02-15 16:26:41 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-02-15 16:26:41 +0900
commitd60cf53a30956e47919788b2ef49287786a959c9 (patch)
treecb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /security/selinux/hooks.c
parent0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff)
parent13c12a4e8ecdf3998cd2d89ade69f6f194819c95 (diff)
Merge branch 'sh/st-integration' into sh/urgent
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r--security/selinux/hooks.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index e276eb46853..c8d69927068 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3198,7 +3198,11 @@ static void selinux_cred_free(struct cred *cred)
{
struct task_security_struct *tsec = cred->security;
- BUG_ON((unsigned long) cred->security < PAGE_SIZE);
+ /*
+ * cred->security == NULL if security_cred_alloc_blank() or
+ * security_prepare_creds() returned an error.
+ */
+ BUG_ON(cred->security && (unsigned long) cred->security < PAGE_SIZE);
cred->security = (void *) 0x7UL;
kfree(tsec);
}