.. | .. |
---|
10 | 10 | #include <linux/audit.h> |
---|
11 | 11 | #include <linux/slab.h> |
---|
12 | 12 | #include <linux/tty.h> |
---|
| 13 | +#include "tty.h" |
---|
13 | 14 | |
---|
14 | 15 | struct tty_audit_buf { |
---|
15 | 16 | struct mutex mutex; /* Protects all data below */ |
---|
.. | .. |
---|
61 | 62 | unsigned char *data, size_t size) |
---|
62 | 63 | { |
---|
63 | 64 | struct audit_buffer *ab; |
---|
64 | | - struct task_struct *tsk = current; |
---|
65 | | - pid_t pid = task_pid_nr(tsk); |
---|
66 | | - uid_t uid = from_kuid(&init_user_ns, task_uid(tsk)); |
---|
67 | | - uid_t loginuid = from_kuid(&init_user_ns, audit_get_loginuid(tsk)); |
---|
68 | | - unsigned int sessionid = audit_get_sessionid(tsk); |
---|
| 65 | + pid_t pid = task_pid_nr(current); |
---|
| 66 | + uid_t uid = from_kuid(&init_user_ns, task_uid(current)); |
---|
| 67 | + uid_t loginuid = from_kuid(&init_user_ns, audit_get_loginuid(current)); |
---|
| 68 | + unsigned int sessionid = audit_get_sessionid(current); |
---|
69 | 69 | |
---|
70 | | - ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY); |
---|
| 70 | + ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_TTY); |
---|
71 | 71 | if (ab) { |
---|
72 | | - char name[sizeof(tsk->comm)]; |
---|
| 72 | + char name[sizeof(current->comm)]; |
---|
73 | 73 | |
---|
74 | 74 | audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u major=%d" |
---|
75 | 75 | " minor=%d comm=", description, pid, uid, |
---|
76 | 76 | loginuid, sessionid, MAJOR(dev), MINOR(dev)); |
---|
77 | | - get_task_comm(name, tsk); |
---|
| 77 | + get_task_comm(name, current); |
---|
78 | 78 | audit_log_untrustedstring(ab, name); |
---|
79 | 79 | audit_log_format(ab, " data="); |
---|
80 | 80 | audit_log_n_hex(ab, data, size); |
---|