lmkd: Fix potential null dereference in hook call am: e9769f7cf3 am: 12371c792c
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2133711 Change-Id: Ib5496447d3b5667cc5f28dd3002339c5ed448350 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e07a5bee30
2
lmkd.cpp
2
lmkd.cpp
|
|
@ -2327,7 +2327,7 @@ static int kill_one_process(struct proc* procp, int min_oom_score, struct kill_i
|
||||||
procp->oomadj, min_oom_score, ki ? ki->max_thrashing : -1);
|
procp->oomadj, min_oom_score, ki ? ki->max_thrashing : -1);
|
||||||
|
|
||||||
result = lmkd_free_memory_before_kill_hook(procp, rss_kb / page_k, min_oom_score,
|
result = lmkd_free_memory_before_kill_hook(procp, rss_kb / page_k, min_oom_score,
|
||||||
ki->kill_reason);
|
ki ? (int)ki->kill_reason : -1);
|
||||||
if (result > 0) {
|
if (result > 0) {
|
||||||
/*
|
/*
|
||||||
* Memory was freed elsewhere; no need to kill. Note: intentionally do not
|
* Memory was freed elsewhere; no need to kill. Note: intentionally do not
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue