summaryrefslogtreecommitdiffstats
path: root/kernel/audit_fsnotify.c
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2018-11-16 16:30:10 -0500
committerPaul Moore <paul@paul-moore.com>2018-11-19 12:31:42 -0500
commita2c97da11cdb973b752dd434aee9636ce10ee737 (patch)
tree0892061d8793295861dc20485abf3699b5199f8a /kernel/audit_fsnotify.c
parent0fe3c7fceb500de2d0adfb9dcf292580cd43ea38 (diff)
downloadlinux-a2c97da11cdb973b752dd434aee9636ce10ee737.tar.gz
linux-a2c97da11cdb973b752dd434aee9636ce10ee737.tar.bz2
linux-a2c97da11cdb973b752dd434aee9636ce10ee737.zip
audit: use session_info helper
There are still a couple of places (mark and watch config changes) that open code auid and ses fields in sequence in records instead of using the audit_log_session_info() helper. Use the helper. Adjust the helper to accommodate being the first fields. Passes audit-testsuite. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> [PM: fixed misspellings in the description] Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'kernel/audit_fsnotify.c')
-rw-r--r--kernel/audit_fsnotify.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c
index fba78047fb37..f90ffa699e5b 100644
--- a/kernel/audit_fsnotify.c
+++ b/kernel/audit_fsnotify.c
@@ -130,9 +130,8 @@ static void audit_mark_log_rule_change(struct audit_fsnotify_mark *audit_mark, c
ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE);
if (unlikely(!ab))
return;
- audit_log_format(ab, "auid=%u ses=%u op=%s",
- from_kuid(&init_user_ns, audit_get_loginuid(current)),
- audit_get_sessionid(current), op);
+ audit_log_session_info(ab);
+ audit_log_format(ab, " op=%s", op);
audit_log_format(ab, " path=");
audit_log_untrustedstring(ab, audit_mark->path);
audit_log_key(ab, rule->filterkey);