wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd: Handle cases when proc_get_name() might return NULL 

proc_get_name() can return NULL if the corresponding process has died
or open fails with ENOMEM due to memory shortages.
Ensure such cases are handled without NULL pointer access.

Bug: 186157675
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I05b288e3808bec0bdb73db32de02ba3a322ca6e1
(cherry picked from commit e5995b8269)
This commit is contained in:
Suren Baghdasaryan 2021-04-23 13:39:37 -07:00 committed by android-build-team Robot
parent 547707cc2e
commit ffce101d86
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lmkd.cpp
View File

@ -1157,9 +1157,10 @@ static void cmd_procprio(LMKD_CTRL_PACKET packet, int field_count, struct ucred
} else {
if (!claim_record(procp, cred->pid)) {
char buf[LINE_MAX];
char *taskname = proc_get_name(cred->pid, buf, sizeof(buf));
/* Only registrant of the record can remove it */
ALOGE("%s (%d, %d) attempts to modify a process registered by another client",
proc_get_name(cred->pid, buf, sizeof(buf)), cred->uid, cred->pid);
taskname ? taskname : "A process ", cred->uid, cred->pid);
return;
}
proc_unslot(procp);
@ -1194,9 +1195,10 @@ static void cmd_procremove(LMKD_CTRL_PACKET packet, struct ucred *cred) {
if (!claim_record(procp, cred->pid)) {
char buf[LINE_MAX];
char *taskname = proc_get_name(cred->pid, buf, sizeof(buf));
/* Only registrant of the record can remove it */
ALOGE("%s (%d, %d) attempts to unregister a process registered by another client",
proc_get_name(cred->pid, buf, sizeof(buf)), cred->uid, cred->pid);
taskname ? taskname : "A process ", cred->uid, cred->pid);
return;
}

2
statslog.cpp
View File

@ -260,7 +260,7 @@ void stats_remove_taskname(int pid) {
}
void stats_store_taskname(int pid, const char* taskname) {
if (!enable_stats_log) {
if (!enable_stats_log || !taskname) {
return;
}