openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Clean up CLOEXEC in qtaguid." am: 72d6269b6e 

am: 2d0899a3b4

* commit '2d0899a3b459a70a387be2983813b452af39e44e':
  Clean up CLOEXEC in qtaguid.
This commit is contained in:
Elliott Hughes 2016-02-23 18:51:36 +00:00 committed by android-build-merger
parent 773e8c5e7c 2d0899a3b4
commit ef2eba04e6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcutils/qtaguid.c
View File

@ -47,10 +47,7 @@ pthread_once_t resTrackInitDone = PTHREAD_ONCE_INIT;
/* Only call once per process. */
void qtaguid_resTrack(void) {
resTrackFd = TEMP_FAILURE_RETRY(open("/dev/xt_qtaguid", O_RDONLY));
if (resTrackFd >=0) {
TEMP_FAILURE_RETRY(fcntl(resTrackFd, F_SETFD, FD_CLOEXEC));
}
resTrackFd = TEMP_FAILURE_RETRY(open("/dev/xt_qtaguid", O_RDONLY | O_CLOEXEC));
}
/*
@ -63,7 +60,7 @@ static int write_ctrl(const char *cmd) {
ALOGV("write_ctrl(%s)", cmd);
fd = TEMP_FAILURE_RETRY(open(CTRL_PROCPATH, O_WRONLY));
fd = TEMP_FAILURE_RETRY(open(CTRL_PROCPATH, O_WRONLY | O_CLOEXEC));
if (fd < 0) {
return -errno;
}
@ -85,7 +82,7 @@ static int write_param(const char *param_path, const char *value) {
int param_fd;
int res;
param_fd = TEMP_FAILURE_RETRY(open(param_path, O_WRONLY));
param_fd = TEMP_FAILURE_RETRY(open(param_path, O_WRONLY | O_CLOEXEC));
if (param_fd < 0) {
return -errno;
}