commit 25d9ca49c29dfdb9f6f7b70ed41e7e17a60d080e
author Nick Kralevich <nnk@google.com> Tue Jan 03 22:55:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 03 22:55:02 2017 +0000
tree 67752cea04777300348607b102c1b59ad0c439d1
parent bb94f854fd80dab29ef1c076790812c886df777d
parent d3726dcfc645ad73e1ef53f55d7237259ce5b601

Merge "LogAudit.cpp: replace newlines with spaces in audit messages" am: 5badada997 am: 5083c589fa am: 48ff04f986
am: 196969f951

Change-Id: I79e02a0348170723116fc8fc8f5fcd83dde3adbc

logd/LogAudit.cpp

diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index c26716d..11ffcb7 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -98,6 +98,13 @@
     }
 
     char *cp;
+    // Work around kernels missing
+    // https://github.com/torvalds/linux/commit/b8f89caafeb55fba75b74bea25adc4e4cd91be67
+    // Such kernels improperly add newlines inside audit messages.
+    while ((cp = strchr(str, '\n'))) {
+        *cp = ' ';
+    }
+
     while ((cp = strstr(str, "  "))) {
         memmove(cp, cp + 1, strlen(cp + 1) + 1);
     }