Commit 4fa7f086 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Paul Moore

audit: simplify audit_enabled check in audit_watch_log_rule_change()

Check the audit_enabled flag and bail immediately.  This does not change
the functionality, but brings the code format in line with similar
checks in audit_tree_log_remove_rule(), audit_mark_log_rule_change(),
and elsewhere in the audit code.

See: https://github.com/linux-audit/audit-kernel/issues/50Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
[PM: tweaked subject line]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 65a8766f
...@@ -238,20 +238,21 @@ static struct audit_watch *audit_dupe_watch(struct audit_watch *old) ...@@ -238,20 +238,21 @@ static struct audit_watch *audit_dupe_watch(struct audit_watch *old)
static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watch *w, char *op) static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watch *w, char *op)
{ {
if (audit_enabled) { struct audit_buffer *ab;
struct audit_buffer *ab;
ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE); if (!audit_enabled)
if (unlikely(!ab)) return;
return; ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE);
audit_log_format(ab, "auid=%u ses=%u op=%s", if (!ab)
from_kuid(&init_user_ns, audit_get_loginuid(current)), return;
audit_get_sessionid(current), op); audit_log_format(ab, "auid=%u ses=%u op=%s",
audit_log_format(ab, " path="); from_kuid(&init_user_ns, audit_get_loginuid(current)),
audit_log_untrustedstring(ab, w->path); audit_get_sessionid(current), op);
audit_log_key(ab, r->filterkey); audit_log_format(ab, " path=");
audit_log_format(ab, " list=%d res=1", r->listnr); audit_log_untrustedstring(ab, w->path);
audit_log_end(ab); audit_log_key(ab, r->filterkey);
} audit_log_format(ab, " list=%d res=1", r->listnr);
audit_log_end(ab);
} }
/* Update inode info in audit rules based on filesystem event. */ /* Update inode info in audit rules based on filesystem event. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment