diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-01-23 07:10:22 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-23 18:51:25 +1100 |
commit | 3bf2a6ac791d64046a537335a0f1d5e43579c5ad (patch) | |
tree | 76fcc0f1be306541c074be4aed3aca66023f0962 /sandbox-systrace.c | |
parent | e027c044c796f3a01081a91bee55741204283f28 (diff) |
upstream: Replace all calls to signal(2) with a wrapper around
sigaction(2). This wrapper blocks all other signals during the handler
preventing races between handlers, and sets SA_RESTART which should reduce
the potential for short read/write operations.
OpenBSD-Commit-ID: 5e047663fd77a40d7b07bdabe68529df51fd2519
Diffstat (limited to 'sandbox-systrace.c')
-rw-r--r-- | sandbox-systrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sandbox-systrace.c b/sandbox-systrace.c index 93e63b8e0..e61d581ae 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c | |||
@@ -105,7 +105,7 @@ ssh_sandbox_init(struct monitor *monitor) | |||
105 | box = xcalloc(1, sizeof(*box)); | 105 | box = xcalloc(1, sizeof(*box)); |
106 | box->systrace_fd = -1; | 106 | box->systrace_fd = -1; |
107 | box->child_pid = 0; | 107 | box->child_pid = 0; |
108 | box->osigchld = signal(SIGCHLD, SIG_IGN); | 108 | box->osigchld = ssh_signal(SIGCHLD, SIG_IGN); |
109 | 109 | ||
110 | return box; | 110 | return box; |
111 | } | 111 | } |
@@ -114,7 +114,7 @@ void | |||
114 | ssh_sandbox_child(struct ssh_sandbox *box) | 114 | ssh_sandbox_child(struct ssh_sandbox *box) |
115 | { | 115 | { |
116 | debug3("%s: ready", __func__); | 116 | debug3("%s: ready", __func__); |
117 | signal(SIGCHLD, box->osigchld); | 117 | ssh_signal(SIGCHLD, box->osigchld); |
118 | if (kill(getpid(), SIGSTOP) != 0) | 118 | if (kill(getpid(), SIGSTOP) != 0) |
119 | fatal("%s: kill(%d, SIGSTOP)", __func__, getpid()); | 119 | fatal("%s: kill(%d, SIGSTOP)", __func__, getpid()); |
120 | debug3("%s: started", __func__); | 120 | debug3("%s: started", __func__); |
@@ -133,7 +133,7 @@ ssh_sandbox_parent(struct ssh_sandbox *box, pid_t child_pid, | |||
133 | do { | 133 | do { |
134 | pid = waitpid(child_pid, &status, WUNTRACED); | 134 | pid = waitpid(child_pid, &status, WUNTRACED); |
135 | } while (pid == -1 && errno == EINTR); | 135 | } while (pid == -1 && errno == EINTR); |
136 | signal(SIGCHLD, box->osigchld); | 136 | ssh_signal(SIGCHLD, box->osigchld); |
137 | if (!WIFSTOPPED(status)) { | 137 | if (!WIFSTOPPED(status)) { |
138 | if (WIFSIGNALED(status)) | 138 | if (WIFSIGNALED(status)) |
139 | fatal("%s: child terminated with signal %d", | 139 | fatal("%s: child terminated with signal %d", |