diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-12-27 19:16:24 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-12-27 19:16:24 +0000 |
| commit | 36b99be9ac8289fdf8eb267e76db0283f1970ace (patch) | |
| tree | 2d6d24c9f7759563924bb874d3134742d84e0354 | |
| parent | Move nd6 timer initialisation to nd6_init() and call timeout_set() (diff) | |
| download | wireguard-openbsd-36b99be9ac8289fdf8eb267e76db0283f1970ace.tar.xz wireguard-openbsd-36b99be9ac8289fdf8eb267e76db0283f1970ace.zip | |
If syslogd was started with a relative path, the program could not
re-exec itself. This exec is done during startup of the privsep
parent or when syslogd restarts after a SIGHUP. Convert a relative
path in argv[0] to an absolute one with realpath(3) before chdir(2).
Do all the path handling in priv_init().
suggested by millert@; OK jca@
| -rw-r--r-- | usr.sbin/syslogd/privsep.c | 18 | ||||
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/usr.sbin/syslogd/privsep.c b/usr.sbin/syslogd/privsep.c index c2f6d883b28..2733c48c0da 100644 --- a/usr.sbin/syslogd/privsep.c +++ b/usr.sbin/syslogd/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.64 2016/10/16 22:12:50 bluhm Exp $ */ +/* $OpenBSD: privsep.c,v 1.65 2016/12/27 19:16:24 bluhm Exp $ */ /* * Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org> @@ -97,7 +97,7 @@ priv_init(int lockfd, int nullfd, int argc, char *argv[]) { int i, socks[2]; struct passwd *pw; - char childnum[11], **privargv; + char *execpath, childnum[11], **privargv; /* Create sockets */ if (socketpair(AF_LOCAL, SOCK_STREAM, PF_UNSPEC, socks) == -1) @@ -114,9 +114,9 @@ priv_init(int lockfd, int nullfd, int argc, char *argv[]) if (!child_pid) { /* Child - drop privileges and return */ if (chroot(pw->pw_dir) != 0) - err(1, "unable to chroot"); + err(1, "chroot %s", pw->pw_dir); if (chdir("/") != 0) - err(1, "unable to chdir"); + err(1, "chdir %s", pw->pw_dir); if (setgroups(1, &pw->pw_gid) == -1) err(1, "setgroups() failed"); @@ -130,6 +130,13 @@ priv_init(int lockfd, int nullfd, int argc, char *argv[]) } close(socks[1]); + if (strchr(argv[0], '/') == NULL) + execpath = argv[0]; + else if ((execpath = realpath(argv[0], NULL)) == NULL) + err(1, "realpath %s", argv[0]); + if (chdir("/") != 0) + err(1, "chdir /"); + if (!Debug) { close(lockfd); dup2(nullfd, STDIN_FILENO); @@ -147,7 +154,8 @@ priv_init(int lockfd, int nullfd, int argc, char *argv[]) snprintf(childnum, sizeof(childnum), "%d", child_pid); if ((privargv = reallocarray(NULL, argc + 3, sizeof(char *))) == NULL) err(1, "alloc priv argv failed"); - for (i = 0; i < argc; i++) + privargv[0] = execpath; + for (i = 1; i < argc; i++) privargv[i] = argv[i]; privargv[i++] = "-P"; privargv[i++] = childnum; diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 19262dfa61a..a2fb57f451f 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syslogd.c,v 1.224 2016/12/23 23:01:48 bluhm Exp $ */ +/* $OpenBSD: syslogd.c,v 1.225 2016/12/27 19:16:24 bluhm Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -685,8 +685,6 @@ main(int argc, char *argv[]) logdebug("off & running....\n"); - chdir("/"); - tzset(); if (!Debug && !Foreground) { |