Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1e8f06d authored by Steve Grubb's avatar Steve Grubb Committed by Paul Moore
Browse files

audit: fix formatting of AUDIT_CONFIG_CHANGE events 



The AUDIT_CONFIG_CHANGE events sometimes use a op= field. The current
code logs the value of the field with quotes. This field is documented
to not be encoded, so it should not have quotes.

Signed-off-by: default avatarSteve Grubb <sgrubb@redhat.com>
Reviewed-by: default avatarRichard Guy Briggs <rgb@redhat.com>
[PM: reformatted commit description to make checkpatch.pl happy]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 833fc48d

kernel/audit_fsnotify.c

+2 −3
Original line number Diff line number Diff line
@@ -130,10 +130,9 @@ 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=",

	audit_log_format(ab, "auid=%u ses=%u op=%s",

			 from_kuid(&init_user_ns, audit_get_loginuid(current)),

			 audit_get_sessionid(current));

	audit_log_string(ab, op);

			 audit_get_sessionid(current), op);

	audit_log_format(ab, " path=");

	audit_log_untrustedstring(ab, audit_mark->path);

	audit_log_key(ab, rule->filterkey);

kernel/audit_tree.c

+1 −2
Original line number Diff line number Diff line
@@ -458,8 +458,7 @@ static void audit_tree_log_remove_rule(struct audit_krule *rule) 
	ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE);

	if (unlikely(!ab))

		return;

	audit_log_format(ab, "op=");

	audit_log_string(ab, "remove_rule");

	audit_log_format(ab, "op=remove_rule");

	audit_log_format(ab, " dir=");

	audit_log_untrustedstring(ab, rule->tree->pathname);

	audit_log_key(ab, rule->filterkey);

kernel/audit_watch.c

+2 −3
Original line number Diff line number Diff line
@@ -242,10 +242,9 @@ 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 (unlikely(!ab))

			return;

		audit_log_format(ab, "auid=%u ses=%u op=",

		audit_log_format(ab, "auid=%u ses=%u op=%s",

				 from_kuid(&init_user_ns, audit_get_loginuid(current)),

				 audit_get_sessionid(current));

		audit_log_string(ab, op);

				 audit_get_sessionid(current), op);

		audit_log_format(ab, " path=");

		audit_log_untrustedstring(ab, w->path);

		audit_log_key(ab, r->filterkey);

kernel/auditfilter.c

+1 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,7 @@ static void audit_log_rule_change(char *action, struct audit_krule *rule, int re 
		return;

	audit_log_format(ab, "auid=%u ses=%u" ,loginuid, sessionid);

	audit_log_task_context(ab);

	audit_log_format(ab, " op=");

	audit_log_string(ab, action);

	audit_log_format(ab, " op=%s", action);

	audit_log_key(ab, rule->filterkey);

	audit_log_format(ab, " list=%d res=%d", rule->listnr, res);

	audit_log_end(ab);