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

Merge "logd: klogd crash (part deux)" am: 96c36d35ce am: e36dbdda43

Browse source 
am: 6d2e1c73a3

Change-Id: Ib31392aa400b744e144788792199931760568281
This commit is contained in:
Mark Salyzyn 2016-08-12 14:38:18 +00:00 committed by android-build-merger
commit f9fb584b66
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"
@ -614,7 +615,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