Merge "lmkd: use after free"

am: 7c3c8c27e1 Change-Id: If54ce69ac7ca03a67e25a2e3a3f4392ba2a8aeca
2018-02-07 02:26:30 +00:00 · 2018-02-07 02:26:30 +00:00 · c95fb64f0f
parent 4e126cd4e9 7c3c8c27e1
commit c95fb64f0f
1 changed files with 3 additions and 3 deletions
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@ -615,11 +615,11 @@ static int kill_one_process(struct proc* procp, int min_score_adj, bool is_criti
    pid_remove(pid);

    if (r) {
-        ALOGE("kill(%d): errno=%d", procp->pid, errno);
+        ALOGE("kill(%d): errno=%d", pid, errno);
        return -1;
-    } else {
-        return tasksize;
    }
+
+    return tasksize;
 }

 /*