logd: klogd deal with nuls in dmesg

Switch to using string and length in all transactions, treating trailing nuls the same as spaces. ToDo: change dumpstate (bugreport) to use logcat -b printable _regardless_ Bug: 23517551 Change-Id: I42162365e6bf8ed79d356e7b689a673902116fdb
spezi77 · Nov 1, 2015 · 0d139dd · 0d139dd
1 parent f3337cb
commit 0d139dd
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 94 deletions.
diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
@@ -239,17 +239,17 @@ int LogAudit::logPrint(const char *fmt, ...) {
     return rc;
 }
 
-int LogAudit::log(char *buf) {
+int LogAudit::log(char *buf, size_t len) {
     char *audit = strstr(buf, " audit(");
-    if (!audit) {
+    if (!audit || (audit >= &buf[len])) {
         return 0;
     }
 
     *audit = '\0';
 
     int rc;
     char *type = strstr(buf, "type=");
-    if (type) {
+    if (type && (type < &buf[len])) {
         rc = logPrint("%s %s", type, audit + 1);
     } else {
         rc = logPrint("%s", audit + 1);

diff --git a/logd/LogAudit.h b/logd/LogAudit.h
@@ -28,7 +28,7 @@ class LogAudit : public SocketListener {
 
 public:
     LogAudit(LogBuffer *buf, LogReader *reader, int fdDmesg);
-    int log(char *buf);
+    int log(char *buf, size_t len);
 
 protected:
     virtual bool onDataAvailable(SocketClient *cli);