Merge "lmkd: use after free" am: 7c3c8c27e1 am: c95fb64f0f

am: 9e11bb0cdb Change-Id: I2ee21f9d995b588a2a08eeaf9366dcfce4354e63
2018-02-07 03:51:59 +00:00 · 2018-02-07 03:51:59 +00:00 · f004c15c0a
parent 653d616754 1d5fdf356d
commit f004c15c0a
1 changed files with 3 additions and 3 deletions
--- a/lmkd.c
+++ b/lmkd.c
@ -664,11 +664,11 @@ static int kill_one_process(struct proc* procp, int min_score_adj,
    TRACE_KILL_END();

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

 /*