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 changes I7d0b85b5,I74796043 

* changes:
  logd: LogStatistics leak
  logd: kill(0,0) issue
This commit is contained in:
Mark Salyzyn 2014-10-07 14:23:46 +00:00 committed by Gerrit Code Review
parent 09dc063319 f48ea7c8dc
commit a083c8578a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
logd/LogStatistics.cpp
View File

@ -54,6 +54,9 @@ bool PidStatistics::pidGone() {
if (mGone || (pid == gone)) {
return true;
}
if (pid == 0) {
return false;
}
if (kill(pid, 0) && (errno != EPERM)) {
mGone = true;
return true;
@ -92,7 +95,9 @@ void PidStatistics::addTotal(size_t size, size_t element) {
// which debuggerd prints as a process is crashing.
char *PidStatistics::pidToName(pid_t pid) {
char *retval = NULL;
if (pid != gone) {
if (pid == 0) { // special case from auditd for kernel
retval = strdup("logd.auditd");
} else if (pid != gone) {
char buffer[512];
snprintf(buffer, sizeof(buffer), "/proc/%u/cmdline", pid);
int fd = open(buffer, O_RDONLY);
@ -302,6 +307,10 @@ void LidStatistics::add(unsigned short size, uid_t uid, pid_t pid) {
}
void LidStatistics::subtract(unsigned short size, uid_t uid, pid_t pid) {
if (uid == (uid_t) -1) { // init
uid = (uid_t) AID_ROOT;
}
UidStatisticsCollection::iterator it;
for (it = begin(); it != end(); ++it) {
UidStatistics *u = *it;