Audit: remove spaces from audit_log_d_path

audit_log_d_path had spaces in the strings which would be emitted on the
error paths.  This patch simply replaces those spaces with an _ or removes
the needless spaces entirely.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 5560390cb0f5..9442c3533ba9 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1440,13 +1440,13 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
         /* We will allow 11 spaces for ' (deleted)' to be appended */
         pathname = kmalloc(PATH_MAX+11, ab->gfp_mask);
         if (!pathname) {
-                audit_log_format(ab, "<no memory>");
+                audit_log_string(ab, "<no_memory>");
                 return;
         }
         p = d_path(path, pathname, PATH_MAX+11);
         if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */
                 /* FIXME: can we save some information here? */
-                audit_log_format(ab, "<too long>");
+                audit_log_string(ab, "<too_long>");
         } else
                 audit_log_untrustedstring(ab, p);
         kfree(pathname);
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index aa0428e08367..7d6ac7c1f414 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1478,7 +1478,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
                         case 0:
                                 /* name was specified as a relative path and the
                                  * directory component is the cwd */
-                                audit_log_d_path(ab, " name=", &context->pwd);
+                                audit_log_d_path(ab, "name=", &context->pwd);
                                 break;
                         default:
                                 /* log the name's directory component */