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/smackfs.c | |
| parent | ad9c2b048b605fbc8d50526e330b88abdd631ab2 (diff) | |
| parent | 676dac4b1bee0469d6932f698aeb77e8489f5861 (diff) | |
| download | talos-obmc-linux-fe27d4b012273640e033be80f143bdc54daa8e16.tar.gz talos-obmc-linux-fe27d4b012273640e033be80f143bdc54daa8e16.zip | |
Merge branch 'smack-next-master' into next
Diffstat (limited to 'security/smack/smackfs.c')
| -rw-r--r-- | security/smack/smackfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index dc1fd6239f24..01a0be93d8d0 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -121,7 +121,7 @@ static void smk_netlabel_audit_set(struct netlbl_audit *nap) { nap->loginuid = audit_get_loginuid(current); nap->sessionid = audit_get_sessionid(current); - nap->secid = smack_to_secid(current_security()); + nap->secid = smack_to_secid(smk_of_current()); } /* @@ -1160,7 +1160,7 @@ static ssize_t smk_write_onlycap(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { char in[SMK_LABELLEN]; - char *sp = current->cred->security; + char *sp = smk_of_task(current->cred->security); if (!capable(CAP_MAC_ADMIN)) return -EPERM; |
