commit ef9aa46bf5fca288a78533457797844404d0c16b
author Suren Baghdasaryan <surenb@google.com> Mon Sep 30 10:07:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 30 10:07:29 2019 -0700
tree 589064fc784c246ef9321331d3d71d7912b64b27
parent 99668d1fca618c7e5eb5fe338c7ae29899832ff4
parent ab7137ba33b76538fbffca0f31f294b20e339b7a

Merge "lmkd: Fix killed process name reporting"
am: 7c2f94bdf0

Change-Id: I82d986b3ef6f19878df8b536ac047d01c0be2ce0

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index f06717d..bf0ae4d 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -1321,8 +1321,9 @@
     /* gid containing AID_READPROC required */
     snprintf(path, PATH_MAX, "/proc/%d/cmdline", pid);
     fd = open(path, O_RDONLY | O_CLOEXEC);
-    if (fd == -1)
+    if (fd == -1) {
         return NULL;
+    }
     ret = read_all(fd, line, sizeof(line) - 1);
     close(fd);
     if (ret < 0) {
@@ -1330,8 +1331,11 @@
     }
 
     cp = strchr(line, ' ');
-    if (cp)
+    if (cp) {
         *cp = '\0';
+    } else {
+        line[ret] = '\0';
+    }
 
     return line;
 }