CRED: Wrap task credential accesses in the tty driver

[linux-2.6-block.git] / drivers / char / tty_audit.c

diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
index 3582f43345a8c1d40397d2284dd2bc11d77a9fd4..d961fa9612c4bf5ada684629fbd1cd755eba1176 100644 (file)
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
@@ -86,14 +86,16 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
        if (ab) {
                char name[sizeof(tsk->comm)];
+               uid_t uid = task_uid(tsk);
 
                audit_log_format(ab, "tty pid=%u uid=%u auid=%u ses=%u "
-                                "major=%d minor=%d comm=", tsk->pid, tsk->uid,
-                                loginuid, sessionid, buf->major, buf->minor);
+                                "major=%d minor=%d comm=",
+                                tsk->pid, uid, loginuid, sessionid,
+                                buf->major, buf->minor);
                get_task_comm(name, tsk);
                audit_log_untrustedstring(ab, name);
                audit_log_format(ab, " data=");
-               audit_log_n_untrustedstring(ab, buf->data, buf->valid);
+               audit_log_n_hex(ab, buf->data, buf->valid);
                audit_log_end(ab);
        }
        buf->valid = 0;