logd: klogd and Mediatek part deux
(cherry pick from commit 47dba71f240624fc0fc9d39e2b91dc82ef164b39)
- switch to an open coded strnrchr
- validity checking on n, taglen and b values.
Bug: 23517551
Change-Id: I568e25c5aa6d8474835454a0e83b19c2921b7986
diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp
index febf775..c6109f5 100644
--- a/logd/LogKlog.cpp
+++ b/logd/LogKlog.cpp
@@ -388,6 +388,16 @@
return ANDROID_LOG_INFO;
}
+static const char *strnrchr(const char *s, size_t len, char c) {
+ const char *save = NULL;
+ for (;len; ++s, len--) {
+ if (*s == c) {
+ save = s;
+ }
+ }
+ return save;
+}
+
//
// log a message into the kernel log buffer
//
@@ -584,11 +594,11 @@
// eg: [143:healthd]healthd -> [143:healthd]
size_t taglen = etag - tag;
// Mediatek-special printk induced stutter
- char *np = strrchr(tag, ']');
- if (np && (++np < etag)) {
- size_t s = etag - np;
- if (((s + s) < taglen) && !strncmp(np, np - 1 - s, s)) {
- taglen = np - tag;
+ const char *mp = strnrchr(tag, ']', taglen);
+ if (mp && (++mp < etag)) {
+ size_t s = etag - mp;
+ if (((s + s) < taglen) && !memcmp(mp, mp - 1 - s, s)) {
+ taglen = mp - tag;
}
}
// skip leading space
@@ -606,15 +616,19 @@
b = 1;
}
size_t n = 1 + taglen + 1 + b + 1;
+ int rc = n;
+ if ((taglen > n) || (b > n)) { // Can not happen ...
+ rc = -EINVAL;
+ return rc;
+ }
// Allocate a buffer to hold the interpreted log message
- int rc = n;
char *newstr = reinterpret_cast<char *>(malloc(n));
if (!newstr) {
rc = -ENOMEM;
return rc;
}
- np = newstr;
+ char *np = newstr;
// Convert priority into single-byte Android logger priority
*np = convertKernelPrioToAndroidPrio(pri);