lmkd: fix potential NULL pointer dereference am: e849f1414e am: 047e6e30e7

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1787727

Change-Id: I905d1733efec72c8e2745cff51cec0547ea57fea
This commit is contained in:
George Burgess IV 2021-08-05 17:51:22 +00:00 committed by Automerger Merge Worker
commit e4689257db
1 changed files with 2 additions and 2 deletions

View File

@ -2168,8 +2168,8 @@ static int kill_one_process(struct proc* procp, int min_oom_score, struct kill_i
mem_st = stats_read_memory_stat(per_app_memcg, pid, uid, rss_kb * 1024, swap_kb * 1024); mem_st = stats_read_memory_stat(per_app_memcg, pid, uid, rss_kb * 1024, swap_kb * 1024);
snprintf(desc, sizeof(desc), "lmk,%d,%d,%d,%d,%d", pid, (int)ki->kill_reason, procp->oomadj, snprintf(desc, sizeof(desc), "lmk,%d,%d,%d,%d,%d", pid, ki ? (int)ki->kill_reason : -1,
min_oom_score, ki->max_thrashing); procp->oomadj, min_oom_score, ki ? ki->max_thrashing : -1);
trace_kill_start(pid, desc); trace_kill_start(pid, desc);
/* CAP_KILL required */ /* CAP_KILL required */