tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

VolumeManager: more O_CLOEXEC changes

Browse source 
Test: compiles and boots
Bug: 129350825
Change-Id: Ie6a0e05f1814d744eb16863f749c939ab1e097e0
This commit is contained in:
Nick Kralevich 2019-03-29 18:35:22 -07:00
parent 87fcd8b36a
commit 58e1a816ba
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
VolumeManager.cpp
View file

@ -499,7 +499,8 @@ int VolumeManager::mountPkgSpecificDirsForRunningProcs(
const std::string& sandboxId = mSandboxIds[appId];
// We purposefully leave the namespace open across the fork
unique_fd nsFd(openat(pidFd.get(), "ns/mnt", O_RDONLY)); // not O_CLOEXEC
// NOLINTNEXTLINE(android-cloexec-open): Deliberately not O_CLOEXEC
unique_fd nsFd(openat(pidFd.get(), "ns/mnt", O_RDONLY));
if (nsFd.get() < 0) {
PLOG(WARNING) << "Failed to open namespace for " << de->d_name;
continue;
@ -640,8 +641,8 @@ int VolumeManager::handleMountModeInstaller(int mountMode, int obbMountDirFd,
PLOG(ERROR) << "Failed to access " << obbMountDir << "/" << sandboxId;
return -errno;
}
const unique_fd fd(
TEMP_FAILURE_RETRY(openat(obbMountDirFd, sandboxId.c_str(), O_RDWR | O_CREAT, 0600)));
const unique_fd fd(TEMP_FAILURE_RETRY(
openat(obbMountDirFd, sandboxId.c_str(), O_RDWR | O_CREAT | O_CLOEXEC, 0600)));
if (fd.get() < 0) {
PLOG(ERROR) << "Failed to create " << obbMountDir << "/" << sandboxId;
return -errno;