| commit | c95fb64f0fb0120c9547b316a8c772aa03d3d49c | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Feb 07 02:26:30 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 07 02:26:30 2018 +0000 |
| tree | ce87cf8b6d72bfadaaa751c9c3a6afae8686e792 | |
| parent | 4e126cd4e92558e5bf270d1b2d5b7366b12a8383 [diff] | |
| parent | 7c3c8c27e101510021ec6ab92520cb686243d870 [diff] |
Merge "lmkd: use after free" am: 7c3c8c27e1 Change-Id: If54ce69ac7ca03a67e25a2e3a3f4392ba2a8aeca
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index b486a17..15471e0 100644 --- a/lmkd/lmkd.c +++ b/lmkd/lmkd.c
@@ -615,11 +615,11 @@ 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; } /*