diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:38:41 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:38:41 -0500 |
commit | 66303bce9b924e35e435d35409d3abc371755767 (patch) | |
tree | 100e69dce809db32dbd0e2bd686df67d2d7c17e2 /drivers/char/tty_audit.c | |
parent | b0fafa816ece0080771355de6158b4dfa8531a95 (diff) |
CRED: Wrap task credential accesses in the tty driver
Wrap access to task credentials so that they can be separated more easily from
the task_struct during the introduction of COW creds.
Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().
Change some task->e?[ug]id to task_e?[ug]id(). In some places it makes more
sense to use RCU directly rather than a convenient wrapper; these will be
addressed by later patches.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/char/tty_audit.c')
-rw-r--r-- | drivers/char/tty_audit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c index 5787249934c8..d961fa9612c4 100644 --- a/drivers/char/tty_audit.c +++ b/drivers/char/tty_audit.c | |||
@@ -86,10 +86,12 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid, | |||
86 | ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY); | 86 | ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY); |
87 | if (ab) { | 87 | if (ab) { |
88 | char name[sizeof(tsk->comm)]; | 88 | char name[sizeof(tsk->comm)]; |
89 | uid_t uid = task_uid(tsk); | ||
89 | 90 | ||
90 | audit_log_format(ab, "tty pid=%u uid=%u auid=%u ses=%u " | 91 | audit_log_format(ab, "tty pid=%u uid=%u auid=%u ses=%u " |
91 | "major=%d minor=%d comm=", tsk->pid, tsk->uid, | 92 | "major=%d minor=%d comm=", |
92 | loginuid, sessionid, buf->major, buf->minor); | 93 | tsk->pid, uid, loginuid, sessionid, |
94 | buf->major, buf->minor); | ||
93 | get_task_comm(name, tsk); | 95 | get_task_comm(name, tsk); |
94 | audit_log_untrustedstring(ab, name); | 96 | audit_log_untrustedstring(ab, name); |
95 | audit_log_format(ab, " data="); | 97 | audit_log_format(ab, " data="); |