Commit e85322d2 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Eric Paris

audit: cull redundancy in audit_rule_change

Re-factor audit_rule_change() to reduce the amount of code redundancy and
simplify the logic.
Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 739c9503
...@@ -1064,31 +1064,27 @@ int audit_rule_change(int type, __u32 portid, int seq, void *data, ...@@ -1064,31 +1064,27 @@ int audit_rule_change(int type, __u32 portid, int seq, void *data,
int err = 0; int err = 0;
struct audit_entry *entry; struct audit_entry *entry;
switch (type) {
case AUDIT_ADD_RULE:
entry = audit_data_to_entry(data, datasz); entry = audit_data_to_entry(data, datasz);
if (IS_ERR(entry)) if (IS_ERR(entry))
return PTR_ERR(entry); return PTR_ERR(entry);
switch (type) {
case AUDIT_ADD_RULE:
err = audit_add_rule(entry); err = audit_add_rule(entry);
audit_log_rule_change("add_rule", &entry->rule, !err); audit_log_rule_change("add_rule", &entry->rule, !err);
if (err)
audit_free_rule(entry);
break; break;
case AUDIT_DEL_RULE: case AUDIT_DEL_RULE:
entry = audit_data_to_entry(data, datasz);
if (IS_ERR(entry))
return PTR_ERR(entry);
err = audit_del_rule(entry); err = audit_del_rule(entry);
audit_log_rule_change("remove_rule", &entry->rule, !err); audit_log_rule_change("remove_rule", &entry->rule, !err);
audit_free_rule(entry);
break; break;
default: default:
err = -EINVAL; err = -EINVAL;
WARN_ON(1); WARN_ON(1);
} }
if (err || type == AUDIT_DEL_RULE)
audit_free_rule(entry);
return err; return err;
} }
......
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