aboutsummaryrefslogtreecommitdiffstats
path: root/security/smack/smack_access.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-12-02 16:21:01 -0500
committerJames Morris <jmorris@namei.org>2010-12-02 16:21:01 -0500
commitfe27d4b012273640e033be80f143bdc54daa8e16 (patch)
tree4e58d69bf300ef2885644ec7f3950dc3fa87be3a /security/smack/smack_access.c
parentad9c2b048b605fbc8d50526e330b88abdd631ab2 (diff)
parent676dac4b1bee0469d6932f698aeb77e8489f5861 (diff)
Merge branch 'smack-next-master' into next
Diffstat (limited to 'security/smack/smack_access.c')
-rw-r--r--security/smack/smack_access.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index f4fac64c4da8..42becbc1ce33 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -185,7 +185,7 @@ out_audit:
185int smk_curacc(char *obj_label, u32 mode, struct smk_audit_info *a) 185int smk_curacc(char *obj_label, u32 mode, struct smk_audit_info *a)
186{ 186{
187 int rc; 187 int rc;
188 char *sp = current_security(); 188 char *sp = smk_of_current();
189 189
190 rc = smk_access(sp, obj_label, mode, NULL); 190 rc = smk_access(sp, obj_label, mode, NULL);
191 if (rc == 0) 191 if (rc == 0)
@@ -196,7 +196,7 @@ int smk_curacc(char *obj_label, u32 mode, struct smk_audit_info *a)
196 * only one that gets privilege and current does not 196 * only one that gets privilege and current does not
197 * have that label. 197 * have that label.
198 */ 198 */
199 if (smack_onlycap != NULL && smack_onlycap != current->cred->security) 199 if (smack_onlycap != NULL && smack_onlycap != sp)
200 goto out_audit; 200 goto out_audit;
201 201
202 if (capable(CAP_MAC_OVERRIDE)) 202 if (capable(CAP_MAC_OVERRIDE))