openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "logd: klogd crash (part deux)" 

am: 96c36d35ce

Change-Id: I95166c1a629007acf2da6d39a05a6586ce38177f
This commit is contained in:
Mark Salyzyn 2016-08-12 14:30:50 +00:00 committed by android-build-merger
parent 40efc4c664 96c36d35ce
commit e36dbdda43
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
logd/LogKlog.cpp
View File

@ -26,6 +26,7 @@
#include <syslog.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include "LogBuffer.h"
#include "LogKlog.h"
@ -589,7 +590,12 @@ 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 tid = pid;
const uid_t uid = pid ? logbuf->pidToUid(pid) : 0;
uid_t uid = AID_ROOT;
if (pid) {
logbuf->lock();
uid = logbuf->pidToUid(pid);
logbuf->unlock();
}
// Parse (rules at top) to pull out a tag from the incoming kernel message.
// Some may view the following as an ugly heuristic, the desire is to