Page MenuHomeFreeBSD
Files F153122250

D41381.id125910.diff
No OneTemporary
Actions

D41381.id125910.diff
View Options

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -388,6 +388,7 @@
SIGCHLD,
};
+static int nulldesc; /* /dev/null descriptor */
static bool Debug; /* debug flag */
static bool Foreground = false; /* Run in foreground, instead of daemonizing */
static bool resolve = true; /* resolve hostname */
@@ -787,6 +788,14 @@
}
(void)strlcpy(consfile.fu_fname, _PATH_CONSOLE + sizeof(_PATH_DEV) - 1,
sizeof(consfile.fu_fname));
+
+ nulldesc = open(_PATH_DEVNULL, O_RDWR);
+ if (nulldesc == -1) {
+ warn("cannot open %s", _PATH_DEVNULL);
+ pidfile_remove(pfh);
+ exit(1);
+ }
+
(void)strlcpy(bootfile, getbootfile(), sizeof(bootfile));
kq = kqueue();
@@ -3213,7 +3222,6 @@
static int
waitdaemon(int maxwait)
{
- int fd;
int status;
pid_t pid, childpid;
@@ -3244,13 +3252,9 @@
return (-1);
(void)chdir("/");
- if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
- (void)dup2(fd, STDIN_FILENO);
- (void)dup2(fd, STDOUT_FILENO);
- (void)dup2(fd, STDERR_FILENO);
- if (fd > STDERR_FILENO)
- (void)close(fd);
- }
+ (void)dup2(nulldesc, STDIN_FILENO);
+ (void)dup2(nulldesc, STDOUT_FILENO);
+ (void)dup2(nulldesc, STDERR_FILENO);
return (getppid());
}
@@ -3573,20 +3577,16 @@
p_open(const char *prog, int *rpd)
{
sigset_t sigset = { };
- int nulldesc, pfd[2], pd;
+ int pfd[2], pd;
pid_t pid;
char *argv[4]; /* sh -c cmd NULL */
char errmsg[200];
if (pipe(pfd) == -1)
return (-1);
- if ((nulldesc = open(_PATH_DEVNULL, O_RDWR)) == -1)
- /* we are royally screwed anyway */
- return (-1);
switch ((pid = pdfork(&pd, PD_CLOEXEC))) {
case -1:
- close(nulldesc);
return (-1);
case 0:
@@ -3617,7 +3617,6 @@
(void)execvp(_PATH_BSHELL, argv);
_exit(255);
}
- close(nulldesc);
close(pfd[0]);
/*
* Avoid blocking on a hung pipe. With O_NONBLOCK, we are

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 7:49 AM (4 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31826393
Default Alt Text
D41381.id125910.diff (1 KB)

Event Timeline