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>

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;
         }