commit fa8acb32200b2aed3221f50385f64ee2b6ab70bb
author Jeff Vander Stoep <jeffv@google.com> Tue Oct 24 17:24:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 24 17:24:58 2017 +0000
tree 2c8728c076fbebc805b3935e94bec18c324c199a
parent 192ebf8acb2158ad33e16146c10e980bbf44842e
parent c923127e23056f2883f9f89e81d0a02ad79fc520

Merge "Check that dir name is a pid before attempting to read" am: 6419445383
am: c923127e23

Change-Id: Ie64df29420d9a6dac7bd5b1f47b4c6c9cda8f078

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 13a943f..c3c95f6 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -37,6 +37,7 @@
 #include <openssl/md5.h>
 
 #include <android-base/logging.h>
+#include <android-base/parseint.h>
 #include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
@@ -596,6 +597,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;