summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2013-07-15 10:23:11 -0400
committerEric Paris <eparis@redhat.com>2014-01-13 22:27:16 -0500
commit2f2ad1013322c8f6c40fc6dafdbd32442fa730ad (patch)
tree5a364888e917c62acb3702ba174a4989a4ce34a1 /kernel
parentf9441639e6319f0c0e12bd63fa2f58990af0a9d2 (diff)
downloadlinux-stable-2f2ad1013322c8f6c40fc6dafdbd32442fa730ad.tar.gz
linux-stable-2f2ad1013322c8f6c40fc6dafdbd32442fa730ad.tar.bz2
linux-stable-2f2ad1013322c8f6c40fc6dafdbd32442fa730ad.zip
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.c4
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)
audit_log_format(ab,
" ppid=%ld pid=%d auid=%u uid=%u gid=%u"
" euid=%u suid=%u fsuid=%u"
- " egid=%u sgid=%u fsgid=%u ses=%u tty=%s",
+ " egid=%u sgid=%u fsgid=%u tty=%s ses=%u",
sys_getppid(),
tsk->pid,
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)
from_kgid(&init_user_ns, cred->egid),
from_kgid(&init_user_ns, cred->sgid),
from_kgid(&init_user_ns, cred->fsgid),
- audit_get_sessionid(tsk), tty);
+ tty, audit_get_sessionid(tsk));
get_task_comm(name, tsk);
audit_log_format(ab, " comm=");