diff options
| author | Omar Polo <op@omarpolo.com> | 2023-06-13 10:59:46 +0000 |
|---|---|---|
| committer | Omar Polo <op@omarpolo.com> | 2023-06-13 10:59:46 +0000 |
| commit | 1b9031f1fccde6f61363328c6efebf045dd97dec (patch) | |
| tree | 64cede178619e199ca3dd68323d89ffa45ee07f1 /proc.c | |
| parent | 94893746ae158901a4896039a0c0dc29ca008d54 (diff) | |
work around missing SOCK_NONBLOCK/CLOEXEC on macos
Diffstat (limited to 'proc.c')
| -rw-r--r-- | proc.c | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -238,10 +238,16 @@ proc_init(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc, pa = &ps->ps_pipes[PROC_PARENT][0]; pb = &ps->ps_pipes[dst][proc]; if (socketpair(AF_UNIX, - SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, + SOCK_STREAM, PF_UNSPEC, fds) == -1) fatal("%s: socketpair", __func__); + mark_nonblock(fds[0]); + mark_nonblock(fds[1]); + if (fcntl(fds[0], F_SETFD, FD_CLOEXEC) == -1 || + fcntl(fds[1], F_SETFD, FD_CLOEXEC) == -1) + fatal("%s: fcntl F_SETFD", __func__); + pa->pp_pipes[dst][proc] = fds[0]; pb->pp_pipes[PROC_PARENT][0] = fds[1]; } @@ -432,10 +438,16 @@ proc_open(struct privsep *ps, int src, int dst) pa = &ps->ps_pipes[src][i]; pb = &ps->ps_pipes[dst][j]; if (socketpair(AF_UNIX, - SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, + SOCK_STREAM, PF_UNSPEC, fds) == -1) fatal("%s: socketpair", __func__); + mark_nonblock(fds[0]); + mark_nonblock(fds[1]); + if (fcntl(fds[0], F_SETFD, FD_CLOEXEC) == -1 || + fcntl(fds[1], F_SETFD, FD_CLOEXEC) == -1) + fatal("%s: fcntl F_SETFD", __func__); + pa->pp_pipes[dst][j] = fds[0]; pb->pp_pipes[src][i] = fds[1]; |