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

syslogd: Use closefrom() instead of getdtablesize()/close() loop.

Browse Source 
When syslogd forks a process for '|' destinations, it closes all file
descriptors greater than 2.

Use closefrom() for this instead of a getdtablesize()/close() loop because
it is both faster and avoids leaving file descriptors open because the limit
was lowered after they were opened.

MFC after:	1 week
This commit is contained in:
jilles 2013-04-27 13:26:35 +00:00
parent ba8e6992c3
commit 72dbb34e66
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/syslogd/syslogd.c
View File

@ -2476,7 +2476,7 @@ validate(struct sockaddr *sa, const char *hname)
static int
p_open(const char *prog, pid_t *rpid)
{
int pfd[2], nulldesc, i;
int pfd[2], nulldesc;
pid_t pid;
sigset_t omask, mask;
char *argv[4]; /* sh -c cmd NULL */
@ -2526,8 +2526,7 @@ p_open(const char *prog, pid_t *rpid)
dup2(pfd[0], STDIN_FILENO);
dup2(nulldesc, STDOUT_FILENO);
dup2(nulldesc, STDERR_FILENO);
for (i = getdtablesize(); i > 2; i--)
(void)close(i);
closefrom(3);
(void)execvp(_PATH_BSHELL, argv);
_exit(255);