summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_audit.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-05-26 02:24:12 +0200
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 12:13:24 +0200
commit8b94eea4bfb8df693c5b35d08b74f13cfb92f3de (patch)
tree908ffbf4f0bb117ca47346712dc0e57f6434cda1 /security/integrity/ima/ima_audit.c
parentuserns: Convert EVM to deal with kuids and kgids in it's hmac computation (diff)
downloadlinux-8b94eea4bfb8df693c5b35d08b74f13cfb92f3de.tar.xz
linux-8b94eea4bfb8df693c5b35d08b74f13cfb92f3de.zip
userns: Add user namespace support to IMA
Use kuid's in the IMA rules. When reporting the current uid in audit logs use from_kuid to get a usable value. Cc: Mimi Zohar <zohar@us.ibm.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'security/integrity/ima/ima_audit.c')
-rw-r--r--security/integrity/ima/ima_audit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c
index 7a57f6769e9c..c586faae8fd6 100644
--- a/security/integrity/ima/ima_audit.c
+++ b/security/integrity/ima/ima_audit.c
@@ -39,8 +39,9 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,
ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno);
audit_log_format(ab, "pid=%d uid=%u auid=%u ses=%u",
- current->pid, current_cred()->uid,
- audit_get_loginuid(current),
+ current->pid,
+ from_kuid(&init_user_ns, current_cred()->uid),
+ from_kuid(&init_user_ns, audit_get_loginuid(current)),
audit_get_sessionid(current));
audit_log_task_context(ab);
audit_log_format(ab, " op=");