userns: Convert audit to work with user namespaces enabled

[firefly-linux-kernel-4.4.55.git] / drivers / tty / tty_audit.c

diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index 5b59bd7f422720e0d415888505920af7f851a2a9..b0b39b823ccf16ec2e0b82264721a0be7e54005f 100644 (file)
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -69,11 +69,12 @@ static void tty_audit_log(const char *description, struct task_struct *tsk,
        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
        if (ab) {
                char name[sizeof(tsk->comm)];
-               uid_t uid = task_uid(tsk);
+               kuid_t uid = task_uid(tsk);
 
                audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u "
                                 "major=%d minor=%d comm=", description,
-                                tsk->pid, uid,
+                                tsk->pid,
+                                from_kuid(&init_user_ns, uid),
                                 from_kuid(&init_user_ns, loginuid),
                                 sessionid,
                                 major, minor);