commit 9fd7559813898f2c0da713add24a08dfab6f864d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 24 16:04:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 24 16:04:22 2017 +0000
tree 91e7d8e3506a9bb8860e7d2d829111a3f80ce7f2
parent 947a57e76dfa5b46bef11254d9eb84d9cf7b1586
parent 5889083d719432f466ebf0f271b21d8141b67a14

Merge "Check that dir name is a pid before attempting to read"

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 1847ab1..befb54d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -34,9 +34,11 @@
 #include <linux/kdev_t.h>
 
 #include <android-base/logging.h>
+#include <android-base/parseint.h>
 #include <android-base/properties.h>
-#include <android-base/strings.h>
 #include <android-base/stringprintf.h>
+#include <android-base/strings.h>
+
 #include <cutils/fs.h>
 #include <utils/Trace.h>
 
@@ -418,6 +420,10 @@
 
     // Poke through all running PIDs look for apps running as UID
     while ((de = readdir(dir))) {
+        pid_t pid;
+        if (de->d_type != DT_DIR) continue;
+        if (!android::base::ParseInt(de->d_name, &pid)) continue;
+
         pidFd = -1;
         nsFd = -1;