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

am: 6419445383

Change-Id: I8b7639934bcee660bcd84f83afae5cc2c17bae15
This commit is contained in:
Jeff Vander Stoep 2017-10-24 17:19:58 +00:00 committed by android-build-merger
commit c923127e23

View file

@ -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 @@ int VolumeManager::remountUid(uid_t uid, const std::string& mode) {
// 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;