commit 34450d70c5ba8efb20df14721507b1bf56e06f82
author Andreas Gampe <agampe@google.com> Tue Mar 14 20:43:43 2017 -0700
committer Andreas Gampe <agampe@google.com> Tue Mar 14 20:43:43 2017 -0700
tree 664f6b675d7a614773c17bc967bc89c246b97690
parent fa05eaa9684bf416ea00e1953e8e345416fbad40

Logd: Fix wrong parameters

Better keep the right order, or ASAN will complain when you read
out of bounds.

Bug: 36234128
Test: m
Test: m && m SANITIZE_TARGET=address
Test: Sanitized device boots without ASAN crashes
Change-Id: Ifc09cb0ece6835d2b636a3ad2128e09ca9aa45c9

logd/LogKlog.cpp

diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp
index 9ae95f9..9dfa14e 100644
--- a/logd/LogKlog.cpp
+++ b/logd/LogKlog.cpp
@@ -754,7 +754,7 @@
     //   eg: [143:healthd]healthd -> [143:healthd]
     taglen = etag - tag;
     // Mediatek-special printk induced stutter
-    const char* mp = strnrchr(tag, ']', taglen);
+    const char* mp = strnrchr(tag, taglen, ']');
     if (mp && (++mp < etag)) {
         size_t s = etag - mp;
         if (((s + s) < taglen) && !fastcmp<memcmp>(mp, mp - 1 - s, s)) {