d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jilles pointed out that O_CLOEXEC could be used in the open(2) flags

Browse Source 
rather than using fcntl(2) later, and in addition to saving a system
call, removes a possible race with fork/exec from threads or signal
handlers.
This commit is contained in:
ghelmer 2012-01-11 16:35:26 +00:00
parent a2848bd240
commit 5f5cbaa5f6
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libutil/pidfile.c
View File

@ -117,7 +117,7 @@ pidfile_open(const char *path, mode_t mode, pid_t *pidptr)
* pidfile_write() can be called multiple times.
*/
fd = flopen(pfh->pf_path,
O_WRONLY | O_CREAT | O_TRUNC | O_NONBLOCK, mode);
O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NONBLOCK, mode);
if (fd == -1) {
if (errno == EWOULDBLOCK && pidptr != NULL) {
count = 20;
@ -138,19 +138,6 @@ pidfile_open(const char *path, mode_t mode, pid_t *pidptr)
return (NULL);
}
/*
* Prevent the file descriptor from escaping to other
* programs via exec(3).
*/
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
error = errno;
unlink(pfh->pf_path);
close(fd);
free(pfh);
errno = error;
return (NULL);
}
/*
* Remember file information, so in pidfile_write() we are sure we write
* to the proper descriptor.