Commit a2c97da1 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Paul Moore
Browse files

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: default avatarRichard Guy Briggs <rgb@redhat.com>
[PM: fixed misspellings in the description]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 0fe3c7fc

kernel/audit_fsnotify.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

kernel/audit_watch.c

+2 −3
Original line number Diff line number Diff line
@@ -245,9 +245,8 @@ static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watc 
	ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE);

	if (!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, w->path);

	audit_log_key(ab, r->filterkey);

kernel/audit.c

+3 −3

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE