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

Merge "Revert "logd: security buffer only AID_SYSTEM reader"" am: c85ce9ba8e

Browse source 
am: 55045303f7

* commit '55045303f732f744554f15fce5e09327e3c348a0':
  Revert "logd: security buffer only AID_SYSTEM reader"
This commit is contained in:
Mark Salyzyn 2016-01-26 23:04:12 +00:00 committed by android-build-merger
commit 6562d34571
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
logd/LogListener.cpp
View file

@ -36,18 +36,6 @@ LogListener::LogListener(LogBuffer *buf, LogReader *reader) :
reader(reader) {
}
static bool clientHasSecurityCredentials(uid_t uid, gid_t gid, pid_t /* pid */) {
if (uid == AID_SYSTEM) {
return true;
}
if (gid == AID_SYSTEM) {
return true;
}
return false;
}
bool LogListener::onDataAvailable(SocketClient *cli) {
static bool name_set;
if (!name_set) {
@ -110,7 +98,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
if ((header->id == LOG_ID_SECURITY) &&
(!__android_log_security() ||
!clientHasSecurityCredentials(cred->uid, cred->gid, cred->pid))) {
!clientHasLogCredentials(cred->uid, cred->gid, cred->pid))) {
return false;
}