diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-02-07 03:51:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-07 03:51:59 +0000 |
| commit | aa41172e81d291b2d5190682d8d71f9a1bb019bc (patch) | |
| tree | ddbb5a68166d1526d3b115a8a7daceaaee9c46ef /lmkd/lmkd.c | |
| parent | 181056b424a9439017e4221553e94b81cac3420c (diff) | |
| parent | 9e11bb0cdb7c288b0f53fa5081a3dadf4376c329 (diff) | |
| download | core-aa41172e81d291b2d5190682d8d71f9a1bb019bc.tar.gz core-aa41172e81d291b2d5190682d8d71f9a1bb019bc.tar.bz2 core-aa41172e81d291b2d5190682d8d71f9a1bb019bc.zip | |
Merge "lmkd: use after free" am: 7c3c8c27e1 am: c95fb64f0f
am: 9e11bb0cdb
Change-Id: I2ee21f9d995b588a2a08eeaf9366dcfce4354e63
Diffstat (limited to 'lmkd/lmkd.c')
| -rw-r--r-- | lmkd/lmkd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index 42ec3ca5e..946a68cbd 100644 --- a/lmkd/lmkd.c +++ b/lmkd/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; } /* |