diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2013-07-15 10:23:11 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2014-01-13 22:27:16 -0500 |
commit | 2f2ad1013322c8f6c40fc6dafdbd32442fa730ad (patch) | |
tree | 5a364888e917c62acb3702ba174a4989a4ce34a1 /kernel | |
parent | f9441639e6319f0c0e12bd63fa2f58990af0a9d2 (diff) |
audit: restore order of tty and ses fields in log output
When being refactored from audit_log_start() to audit_log_task_info(), in
commit e23eb920 the tty and ses fields in the log output got transposed.
Restore to original order to avoid breaking search tools.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/audit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 3d3747be7c52..e88f599a2020 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -1716,7 +1716,7 @@ void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk) | |||
1716 | audit_log_format(ab, | 1716 | audit_log_format(ab, |
1717 | " ppid=%ld pid=%d auid=%u uid=%u gid=%u" | 1717 | " ppid=%ld pid=%d auid=%u uid=%u gid=%u" |
1718 | " euid=%u suid=%u fsuid=%u" | 1718 | " euid=%u suid=%u fsuid=%u" |
1719 | " egid=%u sgid=%u fsgid=%u ses=%u tty=%s", | 1719 | " egid=%u sgid=%u fsgid=%u tty=%s ses=%u", |
1720 | sys_getppid(), | 1720 | sys_getppid(), |
1721 | tsk->pid, | 1721 | tsk->pid, |
1722 | from_kuid(&init_user_ns, audit_get_loginuid(tsk)), | 1722 | from_kuid(&init_user_ns, audit_get_loginuid(tsk)), |
@@ -1728,7 +1728,7 @@ void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk) | |||
1728 | from_kgid(&init_user_ns, cred->egid), | 1728 | from_kgid(&init_user_ns, cred->egid), |
1729 | from_kgid(&init_user_ns, cred->sgid), | 1729 | from_kgid(&init_user_ns, cred->sgid), |
1730 | from_kgid(&init_user_ns, cred->fsgid), | 1730 | from_kgid(&init_user_ns, cred->fsgid), |
1731 | audit_get_sessionid(tsk), tty); | 1731 | tty, audit_get_sessionid(tsk)); |
1732 | 1732 | ||
1733 | get_task_comm(name, tsk); | 1733 | get_task_comm(name, tsk); |
1734 | audit_log_format(ab, " comm="); | 1734 | audit_log_format(ab, " comm="); |