project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validates fd before calling fcntl

Browse Source
This commit is contained in:
Y. T. Chung 2017-07-21 21:40:29 +08:00 committed by David Goldblatt
parent e215a7bc18
commit aa6c282137
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages.c
View File

@ -358,7 +358,9 @@ os_overcommits_proc(void) {
O_CLOEXEC); O_CLOEXEC);
#else #else
fd = (int)syscall(SYS_open, "/proc/sys/vm/overcommit_memory", O_RDONLY); fd = (int)syscall(SYS_open, "/proc/sys/vm/overcommit_memory", O_RDONLY);
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); if (fd != -1) {
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
}
#endif #endif
#elif defined(JEMALLOC_USE_SYSCALL) && defined(SYS_openat) #elif defined(JEMALLOC_USE_SYSCALL) && defined(SYS_openat)
#if defined(O_CLOEXEC) #if defined(O_CLOEXEC)
@ -367,14 +369,18 @@ os_overcommits_proc(void) {
#else #else
fd = (int)syscall(SYS_openat, fd = (int)syscall(SYS_openat,
AT_FDCWD, "/proc/sys/vm/overcommit_memory", O_RDONLY); AT_FDCWD, "/proc/sys/vm/overcommit_memory", O_RDONLY);
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); if (fd != -1) {
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
}
#endif #endif
#else #else
#if defined(O_CLOEXEC) #if defined(O_CLOEXEC)
fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY | O_CLOEXEC); fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY | O_CLOEXEC);
#else #else
fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY); fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY);
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); if (fd != -1) {
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
}
#endif #endif
#endif #endif

4
src/prof.c
View File

@ -1414,7 +1414,9 @@ prof_open_maps(const char *format, ...) {
mfd = open(filename, O_RDONLY | O_CLOEXEC); mfd = open(filename, O_RDONLY | O_CLOEXEC);
#else #else
mfd = open(filename, O_RDONLY); mfd = open(filename, O_RDONLY);
fcntl(mfd, F_SETFD, fcntl(mfd, F_GETFD) | FD_CLOEXEC); if (mfd != -1) {
fcntl(mfd, F_SETFD, fcntl(mfd, F_GETFD) | FD_CLOEXEC);
}
#endif #endif
return mfd; return mfd;