summaryrefslogtreecommitdiffstats
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorPaul Moore <paul@paul-moore.com>2018-08-02 17:56:50 -0400
committerPaul Moore <paul@paul-moore.com>2018-11-26 18:40:00 -0500
commitd0a3f18a70f2d9700bf9f5e9c4a505472388a7c1 (patch)
treeb316add3dac38538bff1756da5d4c8c4f2fd2950 /kernel/audit.c
parentc8fc5d49c341805fee7fc295f2ea8a709f78aec4 (diff)
downloadlinux-stable-d0a3f18a70f2d9700bf9f5e9c4a505472388a7c1.tar.gz
linux-stable-d0a3f18a70f2d9700bf9f5e9c4a505472388a7c1.tar.bz2
linux-stable-d0a3f18a70f2d9700bf9f5e9c4a505472388a7c1.zip
audit: minimize our use of audit_log_format()
There are some cases where we are making multiple audit_log_format() calls in a row, for no apparent reason. Squash these down to a single audit_log_format() call whenever possible. Acked-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 6c53e373b828..d09298d3c2d2 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -2177,22 +2177,21 @@ void audit_log_name(struct audit_context *context, struct audit_names *n,
}
/* log the audit_names record type */
- audit_log_format(ab, " nametype=");
switch(n->type) {
case AUDIT_TYPE_NORMAL:
- audit_log_format(ab, "NORMAL");
+ audit_log_format(ab, " nametype=NORMAL");
break;
case AUDIT_TYPE_PARENT:
- audit_log_format(ab, "PARENT");
+ audit_log_format(ab, " nametype=PARENT");
break;
case AUDIT_TYPE_CHILD_DELETE:
- audit_log_format(ab, "DELETE");
+ audit_log_format(ab, " nametype=DELETE");
break;
case AUDIT_TYPE_CHILD_CREATE:
- audit_log_format(ab, "CREATE");
+ audit_log_format(ab, " nametype=CREATE");
break;
default:
- audit_log_format(ab, "UNKNOWN");
+ audit_log_format(ab, " nametype=UNKNOWN");
break;
}