Merge "lmkd: Fix killed process name reporting"

am: 7c2f94bdf0

Change-Id: I82d986b3ef6f19878df8b536ac047d01c0be2ce0
This commit is contained in:
Suren Baghdasaryan 2019-09-30 10:07:29 -07:00 committed by android-build-merger
commit a280a6071c
1 changed files with 6 additions and 2 deletions

8
lmkd.c
View File

@ -1321,8 +1321,9 @@ static char *proc_get_name(int pid) {
/* gid containing AID_READPROC required */ /* gid containing AID_READPROC required */
snprintf(path, PATH_MAX, "/proc/%d/cmdline", pid); snprintf(path, PATH_MAX, "/proc/%d/cmdline", pid);
fd = open(path, O_RDONLY | O_CLOEXEC); fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd == -1) if (fd == -1) {
return NULL; return NULL;
}
ret = read_all(fd, line, sizeof(line) - 1); ret = read_all(fd, line, sizeof(line) - 1);
close(fd); close(fd);
if (ret < 0) { if (ret < 0) {
@ -1330,8 +1331,11 @@ static char *proc_get_name(int pid) {
} }
cp = strchr(line, ' '); cp = strchr(line, ' ');
if (cp) if (cp) {
*cp = '\0'; *cp = '\0';
} else {
line[ret] = '\0';
}
return line; return line;
} }