commit 213f4bf704d142a69485be41f53a4af57030a63a
author Nick Kralevich <nnk@google.com> Tue Jan 03 22:30:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 03 22:30:01 2017 +0000
tree 7aa24773982bcce1aef9e4c11391ff24696687b3
parent 5afa22b25a179ddc7bf5cc87934a5baceddd6e16
parent 832fabcb2ab4de504e159636355bc1c8a09b9b8a

Merge "LogAudit.cpp: replace newlines with spaces in audit messages"
am: 5badada997

Change-Id: Ic19c090caafa110a88eded401015d1eebfede58d

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