diff options
| author | James Morris <jmorris@namei.org> | 2010-12-03 08:21:01 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-12-03 08:21:01 +1100 |
| commit | fe27d4b012273640e033be80f143bdc54daa8e16 (patch) | |
| tree | 4e58d69bf300ef2885644ec7f3950dc3fa87be3a /security/smack/smack_access.c | |
| parent | ad9c2b048b605fbc8d50526e330b88abdd631ab2 (diff) | |
| parent | 676dac4b1bee0469d6932f698aeb77e8489f5861 (diff) | |
Merge branch 'smack-next-master' into next
Diffstat (limited to 'security/smack/smack_access.c')
| -rw-r--r-- | security/smack/smack_access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index f4fac64c4da..42becbc1ce3 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c @@ -185,7 +185,7 @@ out_audit: int smk_curacc(char *obj_label, u32 mode, struct smk_audit_info *a) { int rc; - char *sp = current_security(); + char *sp = smk_of_current(); rc = smk_access(sp, obj_label, mode, NULL); if (rc == 0) @@ -196,7 +196,7 @@ int smk_curacc(char *obj_label, u32 mode, struct smk_audit_info *a) * only one that gets privilege and current does not * have that label. */ - if (smack_onlycap != NULL && smack_onlycap != current->cred->security) + if (smack_onlycap != NULL && smack_onlycap != sp) goto out_audit; if (capable(CAP_MAC_OVERRIDE)) |