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

vold: cleanups for O_CLOEXEC tidy checks.

Browse source 
Bug: 129350825
Test: compiles and boots
Change-Id: I83a484ca15df1b757b670008f15af5504bc94df1
This commit is contained in:
Nick Kralevich 2019-03-29 16:03:51 -07:00
parent 95587b085e
commit e7e89acbc8
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AppFuseUtil.cpp
View file

@ -123,7 +123,8 @@ int MountAppFuse(uid_t uid, int mountId, android::base::unique_fd* device_fd) {
} }
// Open device FD. // Open device FD.
device_fd->reset(open("/dev/fuse", O_RDWR)); // not O_CLOEXEC // NOLINTNEXTLINE(android-cloexec-open): Deliberately not O_CLOEXEC
device_fd->reset(open("/dev/fuse", O_RDWR));
if (device_fd->get() == -1) { if (device_fd->get() == -1) {
PLOG(ERROR) << "Failed to open /dev/fuse"; PLOG(ERROR) << "Failed to open /dev/fuse";
return -1; return -1;

2
Checkpoint.cpp
View file

@ -575,7 +575,7 @@ Status cp_restoreCheckpoint(const std::string& blockDevice, int restore_limit) {
Status status = Status::ok(); Status status = Status::ok();
LOG(INFO) << action << " checkpoint on " << blockDevice; LOG(INFO) << action << " checkpoint on " << blockDevice;
base::unique_fd device_fd(open(blockDevice.c_str(), O_RDWR)); base::unique_fd device_fd(open(blockDevice.c_str(), O_RDWR | O_CLOEXEC));
if (device_fd < 0) { if (device_fd < 0) {
PLOG(ERROR) << "Cannot open " << blockDevice; PLOG(ERROR) << "Cannot open " << blockDevice;
return Status::fromExceptionCode(errno, ("Cannot open " + blockDevice).c_str()); return Status::fromExceptionCode(errno, ("Cannot open " + blockDevice).c_str());

3
VolumeManager.cpp
View file

@ -500,7 +500,8 @@ int VolumeManager::remountUid(uid_t uid, const std::string& mode) {
} }
// We purposefully leave the namespace open across the fork // We purposefully leave the namespace open across the fork
nsFd = openat(pidFd, "ns/mnt", O_RDONLY); // not O_CLOEXEC // NOLINTNEXTLINE(android-cloexec-open): Deliberately not O_CLOEXEC
nsFd = openat(pidFd, "ns/mnt", O_RDONLY);
if (nsFd < 0) { if (nsFd < 0) {
PLOG(WARNING) << "Failed to open namespace for " << de->d_name; PLOG(WARNING) << "Failed to open namespace for " << de->d_name;
goto next; goto next;

3
secdiscard.cpp
View file

@ -75,7 +75,8 @@ int main(int argc, const char* const argv[]) {
#define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32) #define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32)
#define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32) #define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32)
#endif #endif
android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(target.c_str(), O_WRONLY, 0))); android::base::unique_fd fd(
TEMP_FAILURE_RETRY(open(target.c_str(), O_WRONLY | O_CLOEXEC, 0)));
if (fd == -1) { if (fd == -1) {
LOG(ERROR) << "Secure discard open failed for: " << target; LOG(ERROR) << "Secure discard open failed for: " << target;
return 0; return 0;