tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

logd: ASAN cleansing

Browse source 
A mixture of fixes and cleanup for LogKlog.cpp and friends.

- sscanf calls strlen.  Check if the string is missing a nul
  terminator, if it is, do not call sscanf.
- replace NULL with nullptr for stronger typechecking.
- pass by reference for simpler code.
- Use ssize_t where possible to check for negative values.
- fix FastCmp to add some validity checking since ASAN reports that
  callers are not making sure pre-conditions are met.
- add fasticmp templates for completeness.
- if the buffer is too small to contain a meaningful time, do not
  call down to log_time::strptime() because it does not limit its
  accesses to the buffer boundaries, instead stopping at a
  terminating nul or invalid match.
- move strnstr to LogUtils.h, drop size checking of needle and
  clearly report the list of needles used with android::strnstr
- replace 'sizeof(static const char[]) - 1' with strlen.

Test: gTest liblog-unit-test, logd-unit-tests & logcat-unit-tests
Bug: 30792935
Bug: 36536248
Bug: 35468874
Bug: 34949125
Bug: 34606909
Bug: 36075298
Bug: 36608728
Change-Id: I161bf03ba029050e809b31cceef03f729d318866
This commit is contained in:
Mark Salyzyn 2016-08-11 08:02:06 -07:00
parent 784c851785
commit 0484b3b575
6 changed files with 239 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libutils/include/utils/FastStrcmp.h
View file

@ -17,6 +17,13 @@
#ifndef _ANDROID_UTILS_FASTSTRCMP_H__
#define _ANDROID_UTILS_FASTSTRCMP_H__
#include <ctype.h>
#include <string.h>
#ifndef __predict_true
#define __predict_true(exp) __builtin_expect((exp) != 0, 1)
#endif
#ifdef __cplusplus
// Optimized for instruction cache locality
@ -28,25 +35,41 @@
//
// fastcmp<strncmp>(str1, str2, len)
//
// NB: Does not work for the case insensitive str*cmp functions.
// NB: use fasticmp for the case insensitive str*cmp functions.
// NB: Returns boolean, do not use if expecting to check negative value.
// Thus not semantically identical to the expected function behavior.
template <int (*cmp)(const char *l, const char *r, const size_t s)>
static inline int fastcmp(const char *l, const char *r, const size_t s) {
return (*l != *r) || cmp(l + 1, r + 1, s - 1);
template <int (*cmp)(const char* l, const char* r, const size_t s)>
static inline int fastcmp(const char* l, const char* r, const size_t s) {
const ssize_t n = s; // To help reject negative sizes, treat like zero
return __predict_true(n > 0) &&
((*l != *r) || (__predict_true(n > 1) && cmp(l + 1, r + 1, n - 1)));
}
template <int (*cmp)(const void *l, const void *r, const size_t s)>
static inline int fastcmp(const void *lv, const void *rv, const size_t s) {
const char *l = static_cast<const char *>(lv);
const char *r = static_cast<const char *>(rv);
return (*l != *r) || cmp(l + 1, r + 1, s - 1);
template <int (*cmp)(const char* l, const char* r, const size_t s)>
static inline int fasticmp(const char* l, const char* r, const size_t s) {
const ssize_t n = s; // To help reject negative sizes, treat like zero
return __predict_true(n > 0) &&
((tolower(*l) != tolower(*r)) || (__predict_true(n > 1) && cmp(l + 1, r + 1, n - 1)));
}
template <int (*cmp)(const char *l, const char *r)>
static inline int fastcmp(const char *l, const char *r) {
return (*l != *r) || cmp(l + 1, r + 1);
template <int (*cmp)(const void* l, const void* r, const size_t s)>
static inline int fastcmp(const void* lv, const void* rv, const size_t s) {
const char* l = static_cast<const char*>(lv);
const char* r = static_cast<const char*>(rv);
const ssize_t n = s; // To help reject negative sizes, treat like zero
return __predict_true(n > 0) &&
((*l != *r) || (__predict_true(n > 1) && cmp(l + 1, r + 1, n - 1)));
}
template <int (*cmp)(const char* l, const char* r)>
static inline int fastcmp(const char* l, const char* r) {
return (*l != *r) || (__predict_true(*l) && cmp(l + 1, r + 1));
}
template <int (*cmp)(const char* l, const char* r)>
static inline int fasticmp(const char* l, const char* r) {
return (tolower(*l) != tolower(*r)) || (__predict_true(*l) && cmp(l + 1, r + 1));
}
#endif

16
logd/LogBuffer.cpp
View file

@ -132,11 +132,11 @@ static enum match_type identical(LogBufferElement* elem,
LogBufferElement* last) {
// is it mostly identical?
// if (!elem) return DIFFERENT;
unsigned short lenl = elem->getMsgLen();
if (!lenl) return DIFFERENT;
ssize_t lenl = elem->getMsgLen();
if (lenl <= 0) return DIFFERENT; // value if this represents a chatty elem
// if (!last) return DIFFERENT;
unsigned short lenr = last->getMsgLen();
if (!lenr) return DIFFERENT;
ssize_t lenr = last->getMsgLen();
if (lenr <= 0) return DIFFERENT; // value if this represents a chatty elem
// if (elem->getLogId() != last->getLogId()) return DIFFERENT;
if (elem->getUid() != last->getUid()) return DIFFERENT;
if (elem->getPid() != last->getPid()) return DIFFERENT;
@ -162,8 +162,6 @@ static enum match_type identical(LogBufferElement* elem,
}
// audit message (except sequence number) identical?
static const char avc[] = "): avc: ";
if (last->isBinary()) {
if (fastcmp<memcmp>(msgl, msgr, sizeof(android_log_event_string_t) -
sizeof(int32_t)))
@ -173,6 +171,7 @@ static enum match_type identical(LogBufferElement* elem,
msgr += sizeof(android_log_event_string_t);
lenr -= sizeof(android_log_event_string_t);
}
static const char avc[] = "): avc: ";
const char* avcl = android::strnstr(msgl, lenl, avc);
if (!avcl) return DIFFERENT;
lenl -= avcl - msgl;
@ -180,10 +179,7 @@ static enum match_type identical(LogBufferElement* elem,
if (!avcr) return DIFFERENT;
lenr -= avcr - msgr;
if (lenl != lenr) return DIFFERENT;
// TODO: After b/35468874 is addressed, revisit "lenl > strlen(avc)"
// condition, it might become superfluous.
if (lenl > strlen(avc) &&
fastcmp<memcmp>(avcl + strlen(avc), avcr + strlen(avc),
if (fastcmp<memcmp>(avcl + strlen(avc), avcr + strlen(avc),
lenl - strlen(avc))) {
return DIFFERENT;
}

329
logd/LogKlog.cpp
View file

@ -37,46 +37,49 @@
static const char priority_message[] = { KMSG_PRIORITY(LOG_INFO), '\0' };
// List of the _only_ needles we supply here to android::strnstr
static const char suspendStr[] = "PM: suspend entry ";
static const char resumeStr[] = "PM: suspend exit ";
static const char suspendedStr[] = "Suspended for ";
static const char healthdStr[] = "healthd";
static const char batteryStr[] = ": battery ";
static const char auditStr[] = " audit(";
static const char klogdStr[] = "logd.klogd: ";
// Parsing is hard
// called if we see a '<', s is the next character, returns pointer after '>'
static char* is_prio(char* s, size_t len) {
if (!len || !isdigit(*s++)) {
return NULL;
}
static char* is_prio(char* s, ssize_t len) {
if ((len <= 0) || !isdigit(*s++)) return nullptr;
--len;
static const size_t max_prio_len = (len < 4) ? len : 4;
size_t priolen = 0;
char c;
while (((c = *s++)) && (++priolen <= max_prio_len)) {
if (!isdigit(c)) {
return ((c == '>') && (*s == '[')) ? s : NULL;
}
if (!isdigit(c)) return ((c == '>') && (*s == '[')) ? s : nullptr;
}
return NULL;
return nullptr;
}
// called if we see a '[', s is the next character, returns pointer after ']'
static char* is_timestamp(char* s, size_t len) {
while (len && (*s == ' ')) {
static char* is_timestamp(char* s, ssize_t len) {
while ((len > 0) && (*s == ' ')) {
++s;
--len;
}
if (!len || !isdigit(*s++)) {
return NULL;
}
if ((len <= 0) || !isdigit(*s++)) return nullptr;
--len;
bool first_period = true;
char c;
while (len && ((c = *s++))) {
while ((len > 0) && ((c = *s++))) {
--len;
if ((c == '.') && first_period) {
first_period = false;
} else if (!isdigit(c)) {
return ((c == ']') && !first_period && (*s == ' ')) ? s : NULL;
return ((c == ']') && !first_period && (*s == ' ')) ? s : nullptr;
}
}
return NULL;
return nullptr;
}
// Like strtok_r with "\r\n" except that we look for log signatures (regex)
@ -93,96 +96,82 @@ static char* is_timestamp(char* s, size_t len) {
// space is one more than <digit> of 9
#define OPEN_BRACKET_SPACE ((char)(OPEN_BRACKET_SIG | 10))
char* log_strntok_r(char* s, size_t* len, char** last, size_t* sublen) {
*sublen = 0;
if (!*len) {
return NULL;
}
char* android::log_strntok_r(char* s, ssize_t& len, char*& last,
ssize_t& sublen) {
sublen = 0;
if (len <= 0) return nullptr;
if (!s) {
if (!(s = *last)) {
return NULL;
}
if (!(s = last)) return nullptr;
// fixup for log signature split <,
// LESS_THAN_SIG + <digit>
if ((*s & SIGNATURE_MASK) == LESS_THAN_SIG) {
*s = (*s & ~SIGNATURE_MASK) + '0';
*--s = '<';
++*len;
++len;
}
// fixup for log signature split [,
// OPEN_BRACKET_SPACE is space, OPEN_BRACKET_SIG + <digit>
if ((*s & SIGNATURE_MASK) == OPEN_BRACKET_SIG) {
if (*s == OPEN_BRACKET_SPACE) {
*s = ' ';
} else {
*s = (*s & ~SIGNATURE_MASK) + '0';
}
*s = (*s == OPEN_BRACKET_SPACE) ? ' ' : (*s & ~SIGNATURE_MASK) + '0';
*--s = '[';
++*len;
++len;
}
}
while (*len && ((*s == '\r') || (*s == '\n'))) {
while ((len > 0) && ((*s == '\r') || (*s == '\n'))) {
++s;
--*len;
--len;
}
if (!*len) {
*last = NULL;
return NULL;
}
if (len <= 0) return last = nullptr;
char *peek, *tok = s;
for (;;) {
if (*len == 0) {
*last = NULL;
if (len <= 0) {
last = nullptr;
return tok;
}
char c = *s++;
--*len;
size_t adjust;
--len;
ssize_t adjust;
switch (c) {
case '\r':
case '\n':
s[-1] = '\0';
*last = s;
last = s;
return tok;
case '<':
peek = is_prio(s, *len);
if (!peek) {
break;
}
peek = is_prio(s, len);
if (!peek) break;
if (s != (tok + 1)) { // not first?
s[-1] = '\0';
*s &= ~SIGNATURE_MASK;
*s |= LESS_THAN_SIG; // signature for '<'
*last = s;
last = s;
return tok;
}
adjust = peek - s;
if (adjust > *len) {
adjust = *len;
if (adjust > len) {
adjust = len;
}
*sublen += adjust;
*len -= adjust;
sublen += adjust;
len -= adjust;
s = peek;
if ((*s == '[') && ((peek = is_timestamp(s + 1, *len - 1)))) {
if ((*s == '[') && ((peek = is_timestamp(s + 1, len - 1)))) {
adjust = peek - s;
if (adjust > *len) {
adjust = *len;
if (adjust > len) {
adjust = len;
}
*sublen += adjust;
*len -= adjust;
sublen += adjust;
len -= adjust;
s = peek;
}
break;
case '[':
peek = is_timestamp(s, *len);
if (!peek) {
break;
}
peek = is_timestamp(s, len);
if (!peek) break;
if (s != (tok + 1)) { // not first?
s[-1] = '\0';
if (*s == ' ') {
@ -191,19 +180,19 @@ char* log_strntok_r(char* s, size_t* len, char** last, size_t* sublen) {
*s &= ~SIGNATURE_MASK;
*s |= OPEN_BRACKET_SIG; // signature for '['
}
*last = s;
last = s;
return tok;
}
adjust = peek - s;
if (adjust > *len) {
adjust = *len;
if (adjust > len) {
adjust = len;
}
*sublen += adjust;
*len -= adjust;
sublen += adjust;
len -= adjust;
s = peek;
break;
}
++*sublen;
++sublen;
}
// NOTREACHED
}
@ -222,9 +211,10 @@ LogKlog::LogKlog(LogBuffer* buf, LogReader* reader, int fdWrite, int fdRead,
initialized(false),
enableLogging(true),
auditd(auditd) {
static const char klogd_message[] = "%slogd.klogd: %" PRIu64 "\n";
char buffer[sizeof(priority_message) + sizeof(klogd_message) + 20 - 4];
snprintf(buffer, sizeof(buffer), klogd_message, priority_message,
static const char klogd_message[] = "%s%s%" PRIu64 "\n";
char buffer[strlen(priority_message) + strlen(klogdStr) +
strlen(klogd_message) + 20];
snprintf(buffer, sizeof(buffer), klogd_message, priority_message, klogdStr,
signature.nsec());
write(fdWrite, buffer, strlen(buffer));
}
@ -237,15 +227,15 @@ bool LogKlog::onDataAvailable(SocketClient* cli) {
}
char buffer[LOGGER_ENTRY_MAX_PAYLOAD];
size_t len = 0;
ssize_t len = 0;
for (;;) {
ssize_t retval = 0;
if ((sizeof(buffer) - 1 - len) > 0) {
if (len < (ssize_t)(sizeof(buffer) - 1)) {
retval =
read(cli->getSocket(), buffer + len, sizeof(buffer) - 1 - len);
}
if ((retval == 0) && (len == 0)) {
if ((retval == 0) && (len <= 0)) {
break;
}
if (retval < 0) {
@ -255,15 +245,16 @@ bool LogKlog::onDataAvailable(SocketClient* cli) {
bool full = len == (sizeof(buffer) - 1);
char* ep = buffer + len;
*ep = '\0';
size_t sublen;
for (char *ptr = NULL, *tok = buffer;
((tok = log_strntok_r(tok, &len, &ptr, &sublen))); tok = NULL) {
ssize_t sublen;
for (char *ptr = nullptr, *tok = buffer;
!!(tok = android::log_strntok_r(tok, len, ptr, sublen));
tok = nullptr) {
if (((tok + sublen) >= ep) && (retval != 0) && full) {
memmove(buffer, tok, sublen);
if (sublen > 0) memmove(buffer, tok, sublen);
len = sublen;
break;
}
if (*tok) {
if ((sublen > 0) && *tok) {
log(tok, sublen);
}
}
@ -273,9 +264,12 @@ bool LogKlog::onDataAvailable(SocketClient* cli) {
}
void LogKlog::calculateCorrection(const log_time& monotonic,
const char* real_string, size_t len) {
const char* real_string, ssize_t len) {
static const char real_format[] = "%Y-%m-%d %H:%M:%S.%09q UTC";
if (len < (ssize_t)(strlen(real_format) + 5)) return;
log_time real;
const char* ep = real.strptime(real_string, "%Y-%m-%d %H:%M:%S.%09q UTC");
const char* ep = real.strptime(real_string, real_format);
if (!ep || (ep > &real_string[len]) || (real > log_time(CLOCK_REALTIME))) {
return;
}
@ -299,73 +293,50 @@ void LogKlog::calculateCorrection(const log_time& monotonic,
}
}
static const char suspendStr[] = "PM: suspend entry ";
static const char resumeStr[] = "PM: suspend exit ";
static const char suspendedStr[] = "Suspended for ";
const char* android::strnstr(const char* s, size_t len, const char* needle) {
char c;
if (!len) return NULL;
if ((c = *needle++) != 0) {
size_t needleLen = strlen(needle);
do {
do {
if (len <= needleLen) return NULL;
--len;
} while (*s++ != c);
} while (fastcmp<memcmp>(s, needle, needleLen));
s--;
}
return s;
}
void LogKlog::sniffTime(log_time& now, const char** buf, size_t len,
void LogKlog::sniffTime(log_time& now, const char*& buf, ssize_t len,
bool reverse) {
const char* cp = now.strptime(*buf, "[ %s.%q]");
if (cp && (cp >= &(*buf)[len])) {
cp = NULL;
if (len <= 0) return;
const char* cp = nullptr;
if ((len > 10) && (*buf == '[')) {
cp = now.strptime(buf, "[ %s.%q]"); // can index beyond buffer bounds
if (cp && (cp > &buf[len - 1])) cp = nullptr;
}
if (cp) {
static const char healthd[] = "healthd";
static const char battery[] = ": battery ";
len -= cp - *buf;
if (len && isspace(*cp)) {
len -= cp - buf;
if ((len > 0) && isspace(*cp)) {
++cp;
--len;
}
*buf = cp;
buf = cp;
if (isMonotonic()) {
return;
}
if (isMonotonic()) return;
const char* b;
if (((b = android::strnstr(cp, len, suspendStr))) &&
((size_t)((b += sizeof(suspendStr) - 1) - cp) < len)) {
(((b += strlen(suspendStr)) - cp) < len)) {
len -= b - cp;
calculateCorrection(now, b, len);
} else if (((b = android::strnstr(cp, len, resumeStr))) &&
((size_t)((b += sizeof(resumeStr) - 1) - cp) < len)) {
(((b += strlen(resumeStr)) - cp) < len)) {
len -= b - cp;
calculateCorrection(now, b, len);
} else if (((b = android::strnstr(cp, len, healthd))) &&
((size_t)((b += sizeof(healthd) - 1) - cp) < len) &&
((b = android::strnstr(b, len -= b - cp, battery))) &&
((size_t)((b += sizeof(battery) - 1) - cp) < len)) {
} else if (((b = android::strnstr(cp, len, healthdStr))) &&
(((b += strlen(healthdStr)) - cp) < len) &&
((b = android::strnstr(b, len -= b - cp, batteryStr))) &&
(((b += strlen(batteryStr)) - cp) < len)) {
// NB: healthd is roughly 150us late, so we use it instead to
// trigger a check for ntp-induced or hardware clock drift.
log_time real(CLOCK_REALTIME);
log_time mono(CLOCK_MONOTONIC);
correction = (real < mono) ? log_time::EPOCH : (real - mono);
} else if (((b = android::strnstr(cp, len, suspendedStr))) &&
((size_t)((b += sizeof(suspendStr) - 1) - cp) < len)) {
(((b += strlen(suspendStr)) - cp) < len)) {
len -= b - cp;
log_time real;
char* endp;
real.tv_sec = strtol(b, &endp, 10);
if ((*endp == '.') && ((size_t)(endp - b) < len)) {
if ((*endp == '.') && ((endp - b) < len)) {
unsigned long multiplier = NS_PER_SEC;
real.tv_nsec = 0;
len -= endp - b;
@ -394,8 +365,15 @@ void LogKlog::sniffTime(log_time& now, const char** buf, size_t len,
}
}
pid_t LogKlog::sniffPid(const char** buf, size_t len) {
const char* cp = *buf;
pid_t LogKlog::sniffPid(const char*& buf, ssize_t len) {
if (len <= 0) return 0;
const char* cp = buf;
// sscanf does a strlen, let's check if the string is not nul terminated.
// pseudo out-of-bounds access since we always have an extra char on buffer.
if (((ssize_t)strnlen(cp, len) == len) && cp[len]) {
return 0;
}
// HTC kernels with modified printk "c0 1648 "
if ((len > 9) && (cp[0] == 'c') && isdigit(cp[1]) &&
(isdigit(cp[2]) || (cp[2] == ' ')) && (cp[3] == ' ')) {
@ -412,7 +390,7 @@ pid_t LogKlog::sniffPid(const char** buf, size_t len) {
int pid = 0;
char dummy;
if (sscanf(cp + 4, "%d%c", &pid, &dummy) == 2) {
*buf = cp + 10; // skip-it-all
buf = cp + 10; // skip-it-all
return pid;
}
}
@ -434,28 +412,28 @@ pid_t LogKlog::sniffPid(const char** buf, size_t len) {
}
// kernel log prefix, convert to a kernel log priority number
static int parseKernelPrio(const char** buf, size_t len) {
static int parseKernelPrio(const char*& buf, ssize_t len) {
int pri = LOG_USER | LOG_INFO;
const char* cp = *buf;
if (len && (*cp == '<')) {
const char* cp = buf;
if ((len > 0) && (*cp == '<')) {
pri = 0;
while (--len && isdigit(*++cp)) {
pri = (pri * 10) + *cp - '0';
}
if (len && (*cp == '>')) {
if ((len > 0) && (*cp == '>')) {
++cp;
} else {
cp = *buf;
cp = buf;
pri = LOG_USER | LOG_INFO;
}
*buf = cp;
buf = cp;
}
return pri;
}
// Passed the entire SYSLOG_ACTION_READ_ALL buffer and interpret a
// compensated start time.
void LogKlog::synchronize(const char* buf, size_t len) {
void LogKlog::synchronize(const char* buf, ssize_t len) {
const char* cp = android::strnstr(buf, len, suspendStr);
if (!cp) {
cp = android::strnstr(buf, len, resumeStr);
@ -471,10 +449,10 @@ void LogKlog::synchronize(const char* buf, size_t len) {
if (*cp == '\n') {
++cp;
}
parseKernelPrio(&cp, len - (cp - buf));
parseKernelPrio(cp, len - (cp - buf));
log_time now;
sniffTime(now, &cp, len - (cp - buf), true);
sniffTime(now, cp, len - (cp - buf), true);
const char* suspended = android::strnstr(buf, len, suspendedStr);
if (!suspended || (suspended > cp)) {
@ -488,9 +466,9 @@ void LogKlog::synchronize(const char* buf, size_t len) {
if (*cp == '\n') {
++cp;
}
parseKernelPrio(&cp, len - (cp - buf));
parseKernelPrio(cp, len - (cp - buf));
sniffTime(now, &cp, len - (cp - buf), true);
sniffTime(now, cp, len - (cp - buf), true);
}
// Convert kernel log priority number into an Android Logger priority number
@ -523,9 +501,9 @@ static int convertKernelPrioToAndroidPrio(int pri) {
return ANDROID_LOG_INFO;
}
static const char* strnrchr(const char* s, size_t len, char c) {
const char* save = NULL;
for (; len; ++s, len--) {
static const char* strnrchr(const char* s, ssize_t len, char c) {
const char* save = nullptr;
for (; len > 0; ++s, len--) {
if (*s == c) {
save = s;
}
@ -566,22 +544,21 @@ static const char* strnrchr(const char* s, size_t len, char c) {
// logd.klogd:
// return -1 if message logd.klogd: <signature>
//
int LogKlog::log(const char* buf, size_t len) {
if (auditd && android::strnstr(buf, len, " audit(")) {
int LogKlog::log(const char* buf, ssize_t len) {
if (auditd && android::strnstr(buf, len, auditStr)) {
return 0;
}
const char* p = buf;
int pri = parseKernelPrio(&p, len);
int pri = parseKernelPrio(p, len);
log_time now;
sniffTime(now, &p, len - (p - buf), false);
sniffTime(now, p, len - (p - buf), false);
// sniff for start marker
const char klogd_message[] = "logd.klogd: ";
const char* start = android::strnstr(p, len - (p - buf), klogd_message);
const char* start = android::strnstr(p, len - (p - buf), klogdStr);
if (start) {
uint64_t sig = strtoll(start + sizeof(klogd_message) - 1, NULL, 10);
uint64_t sig = strtoll(start + strlen(klogdStr), nullptr, 10);
if (sig == signature.nsec()) {
if (initialized) {
enableLogging = true;
@ -598,7 +575,7 @@ int LogKlog::log(const char* buf, size_t len) {
}
// Parse pid, tid and uid
const pid_t pid = sniffPid(&p, len - (p - buf));
const pid_t pid = sniffPid(p, len - (p - buf));
const pid_t tid = pid;
uid_t uid = AID_ROOT;
if (pid) {
@ -620,11 +597,11 @@ int LogKlog::log(const char* buf, size_t len) {
start = p;
const char* tag = "";
const char* etag = tag;
size_t taglen = len - (p - buf);
ssize_t taglen = len - (p - buf);
const char* bt = p;
static const char infoBrace[] = "[INFO]";
static const size_t infoBraceLen = strlen(infoBrace);
static const ssize_t infoBraceLen = strlen(infoBrace);
if ((taglen >= infoBraceLen) &&
!fastcmp<strncmp>(p, infoBrace, infoBraceLen)) {
// <PRI>[<TIME>] "[INFO]"<tag> ":" message
@ -633,26 +610,26 @@ int LogKlog::log(const char* buf, size_t len) {
}
const char* et;
for (et = bt; taglen && *et && (*et != ':') && !isspace(*et);
for (et = bt; (taglen > 0) && *et && (*et != ':') && !isspace(*et);
++et, --taglen) {
// skip ':' within [ ... ]
if (*et == '[') {
while (taglen && *et && *et != ']') {
while ((taglen > 0) && *et && *et != ']') {
++et;
--taglen;
}
if (!taglen) {
if (taglen <= 0) {
break;
}
}
}
const char* cp;
for (cp = et; taglen && isspace(*cp); ++cp, --taglen) {
for (cp = et; (taglen > 0) && isspace(*cp); ++cp, --taglen) {
}
// Validate tag
size_t size = et - bt;
if (taglen && size) {
ssize_t size = et - bt;
if ((taglen > 0) && (size > 0)) {
if (*cp == ':') {
// ToDo: handle case insensitive colon separated logging stutter:
// <tag> : <tag>: ...
@ -672,12 +649,12 @@ int LogKlog::log(const char* buf, size_t len) {
const char* b = cp;
cp += size;
taglen -= size;
while (--taglen && !isspace(*++cp) && (*cp != ':')) {
while ((--taglen > 0) && !isspace(*++cp) && (*cp != ':')) {
}
const char* e;
for (e = cp; taglen && isspace(*cp); ++cp, --taglen) {
for (e = cp; (taglen > 0) && isspace(*cp); ++cp, --taglen) {
}
if (taglen && (*cp == ':')) {
if ((taglen > 0) && (*cp == ':')) {
tag = b;
etag = e;
p = cp + 1;
@ -685,7 +662,7 @@ int LogKlog::log(const char* buf, size_t len) {
} else {
// what about <PRI>[<TIME>] <tag>_host '<tag><stuff>' : message
static const char host[] = "_host";
static const size_t hostlen = strlen(host);
static const ssize_t hostlen = strlen(host);
if ((size > hostlen) &&
!fastcmp<strncmp>(bt + size - hostlen, host, hostlen) &&
!fastcmp<strncmp>(bt + 1, cp + 1, size - hostlen - 1)) {
@ -693,12 +670,14 @@ int LogKlog::log(const char* buf, size_t len) {
cp += size - hostlen;
taglen -= size - hostlen;
if (*cp == '.') {
while (--taglen && !isspace(*++cp) && (*cp != ':')) {
while ((--taglen > 0) && !isspace(*++cp) &&
(*cp != ':')) {
}
const char* e;
for (e = cp; taglen && isspace(*cp); ++cp, --taglen) {
for (e = cp; (taglen > 0) && isspace(*cp);
++cp, --taglen) {
}
if (taglen && (*cp == ':')) {
if ((taglen > 0) && (*cp == ':')) {
tag = b;
etag = e;
p = cp + 1;
@ -711,13 +690,13 @@ int LogKlog::log(const char* buf, size_t len) {
} else {
// <PRI>[<TIME>] <tag> <stuff>' : message
twoWord:
while (--taglen && !isspace(*++cp) && (*cp != ':')) {
while ((--taglen > 0) && !isspace(*++cp) && (*cp != ':')) {
}
const char* e;
for (e = cp; taglen && isspace(*cp); ++cp, --taglen) {
for (e = cp; (taglen > 0) && isspace(*cp); ++cp, --taglen) {
}
// Two words
if (taglen && (*cp == ':')) {
if ((taglen > 0) && (*cp == ':')) {
tag = bt;
etag = e;
p = cp + 1;
@ -726,13 +705,13 @@ int LogKlog::log(const char* buf, size_t len) {
} // else no tag
static const char cpu[] = "CPU";
static const size_t cpuLen = strlen(cpu);
static const ssize_t cpuLen = strlen(cpu);
static const char warning[] = "WARNING";
static const size_t warningLen = strlen(warning);
static const ssize_t warningLen = strlen(warning);
static const char error[] = "ERROR";
static const size_t errorLen = strlen(error);
static const ssize_t errorLen = strlen(error);
static const char info[] = "INFO";
static const size_t infoLen = strlen(info);
static const ssize_t infoLen = strlen(info);
size = etag - tag;
if ((size <= 1) ||
@ -756,13 +735,13 @@ int LogKlog::log(const char* buf, size_t len) {
// Mediatek-special printk induced stutter
const char* mp = strnrchr(tag, taglen, ']');
if (mp && (++mp < etag)) {
size_t s = etag - mp;
ssize_t s = etag - mp;
if (((s + s) < taglen) && !fastcmp<memcmp>(mp, mp - 1 - s, s)) {
taglen = mp - tag;
}
}
// Deal with sloppy and simplistic harmless p = cp + 1 etc above.
if (len < (size_t)(p - buf)) {
if (len < (p - buf)) {
p = &buf[len];
}
// skip leading space
@ -770,12 +749,12 @@ int LogKlog::log(const char* buf, size_t len) {
++p;
}
// truncate trailing space or nuls
size_t b = len - (p - buf);
while (b && (isspace(p[b - 1]) || !p[b - 1])) {
ssize_t b = len - (p - buf);
while ((b > 0) && (isspace(p[b - 1]) || !p[b - 1])) {
--b;
}
// trick ... allow tag with empty content to be logged. log() drops empty
if (!b && taglen) {
if ((b <= 0) && (taglen > 0)) {
p = " ";
b = 1;
}
@ -787,9 +766,9 @@ int LogKlog::log(const char* buf, size_t len) {
taglen = LOGGER_ENTRY_MAX_PAYLOAD;
}
// calculate buffer copy requirements
size_t n = 1 + taglen + 1 + b + 1;
ssize_t n = 1 + taglen + 1 + b + 1;
// paranoid sanity check, first two just can not happen ...
if ((taglen > n) || (b > n) || (n > USHRT_MAX)) {
if ((taglen > n) || (b > n) || (n > (ssize_t)USHRT_MAX) || (n <= 0)) {
return -EINVAL;
}

12
logd/LogKlog.h
View file

@ -20,8 +20,6 @@
#include <private/android_logger.h>
#include <sysutils/SocketListener.h>
char* log_strntok_r(char* s, size_t* len, char** saveptr, size_t* sublen);
class LogBuffer;
class LogReader;
@ -43,8 +41,8 @@ class LogKlog : public SocketListener {
public:
LogKlog(LogBuffer* buf, LogReader* reader, int fdWrite, int fdRead,
bool auditd);
int log(const char* buf, size_t len);
void synchronize(const char* buf, size_t len);
int log(const char* buf, ssize_t len);
void synchronize(const char* buf, ssize_t len);
bool isMonotonic() {
return logbuf->isMonotonic();
@ -57,10 +55,10 @@ class LogKlog : public SocketListener {
}
protected:
void sniffTime(log_time& now, const char** buf, size_t len, bool reverse);
pid_t sniffPid(const char** buf, size_t len);
void sniffTime(log_time& now, const char*& buf, ssize_t len, bool reverse);
pid_t sniffPid(const char*& buf, ssize_t len);
void calculateCorrection(const log_time& monotonic, const char* real_string,
size_t len);
ssize_t len);
virtual bool onDataAvailable(SocketClient* cli);
};

21
logd/LogUtils.h
View file

@ -43,8 +43,25 @@ char* tidToName(pid_t tid);
const char* tagToName(uint32_t tag);
void ReReadEventLogTags();
// Furnished by LogKlog.cpp.
const char* strnstr(const char* s, size_t len, const char* needle);
// Furnished by LogKlog.cpp
char* log_strntok_r(char* s, ssize_t& len, char*& saveptr, ssize_t& sublen);
// needle should reference a string longer than 1 character
static inline const char* strnstr(const char* s, ssize_t len,
const char* needle) {
if (len <= 0) return nullptr;
const char c = *needle++;
const size_t needleLen = strlen(needle);
do {
do {
if (len <= (ssize_t)needleLen) return nullptr;
--len;
} while (*s++ != c);
} while (fastcmp<memcmp>(s, needle, needleLen));
s--;
return s;
}
}
// Furnished in LogCommand.cpp

38
logd/main.cpp
View file

@ -221,7 +221,7 @@ static char* name;
static sem_t reinit;
static bool reinit_running = false;
static LogBuffer* logBuf = NULL;
static LogBuffer* logBuf = nullptr;
static bool package_list_parser_cb(pkg_info* info, void* /* userdata */) {
bool rc = true;
@ -254,9 +254,9 @@ static void* reinit_thread_start(void* /*obj*/) {
while (reinit_running && !sem_wait(&reinit) && reinit_running) {
// uidToName Privileged Worker
if (uid) {
name = NULL;
name = nullptr;
packagelist_parse(package_list_parser_cb, NULL);
packagelist_parse(package_list_parser_cb, nullptr);
uid = 0;
sem_post(&uidName);
@ -291,19 +291,19 @@ static void* reinit_thread_start(void* /*obj*/) {
// Anything that reads persist.<property>
if (logBuf) {
logBuf->init();
logBuf->initPrune(NULL);
logBuf->initPrune(nullptr);
}
android::ReReadEventLogTags();
}
return NULL;
return nullptr;
}
static sem_t sem_name;
char* android::uidToName(uid_t u) {
if (!u || !reinit_running) {
return NULL;
return nullptr;
}
sem_wait(&sem_name);
@ -311,7 +311,7 @@ char* android::uidToName(uid_t u) {
// Not multi-thread safe, we use sem_name to protect
uid = u;
name = NULL;
name = nullptr;
sem_post(&reinit);
sem_wait(&uidName);
char* ret = name;
@ -332,12 +332,13 @@ static void readDmesg(LogAudit* al, LogKlog* kl) {
return;
}
int rc = klogctl(KLOG_SIZE_BUFFER, NULL, 0);
int rc = klogctl(KLOG_SIZE_BUFFER, nullptr, 0);
if (rc <= 0) {
return;
}
size_t len = rc + 1024; // Margin for additional input race or trailing nul
// Margin for additional input race or trailing nul
ssize_t len = rc + 1024;
std::unique_ptr<char[]> buf(new char[len]);
rc = klogctl(KLOG_READ_ALL, buf.get(), len);
@ -345,7 +346,7 @@ static void readDmesg(LogAudit* al, LogKlog* kl) {
return;
}
if ((size_t)rc < len) {
if (rc < len) {
len = rc + 1;
}
buf[--len] = '\0';
@ -354,10 +355,11 @@ static void readDmesg(LogAudit* al, LogKlog* kl) {
kl->synchronize(buf.get(), len);
}
size_t sublen;
for (char *ptr = NULL, *tok = buf.get();
(rc >= 0) && ((tok = log_strntok_r(tok, &len, &ptr, &sublen)));
tok = NULL) {
ssize_t sublen;
for (char *ptr = nullptr, *tok = buf.get();
(rc >= 0) && !!(tok = android::log_strntok_r(tok, len, ptr, sublen));
tok = nullptr) {
if ((sublen <= 0) || !*tok) continue;
if (al) {
rc = al->log(tok, sublen);
}
@ -444,7 +446,7 @@ int main(int argc, char* argv[]) {
if (!pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)) {
pthread_t thread;
reinit_running = true;
if (pthread_create(&thread, &attr, reinit_thread_start, NULL)) {
if (pthread_create(&thread, &attr, reinit_thread_start, nullptr)) {
reinit_running = false;
}
}
@ -507,7 +509,7 @@ int main(int argc, char* argv[]) {
// initiated log messages. New log entries are added to LogBuffer
// and LogReader is notified to send updates to connected clients.
LogAudit* al = NULL;
LogAudit* al = nullptr;
if (auditd) {
al = new LogAudit(logBuf, reader,
__android_logger_property_get_bool(
@ -516,9 +518,9 @@ int main(int argc, char* argv[]) {
: -1);
}
LogKlog* kl = NULL;
LogKlog* kl = nullptr;
if (klogd) {
kl = new LogKlog(logBuf, reader, fdDmesg, fdPmesg, al != NULL);
kl = new LogKlog(logBuf, reader, fdDmesg, fdPmesg, al != nullptr);
}
readDmesg(al, kl);