summaryrefslogtreecommitdiff
path: root/sandbox-systrace.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-02-21 11:57:14 +0000
committerColin Watson <cjwatson@debian.org>2020-02-21 14:27:02 +0000
commit886e47e745586c34e81cfd5c5fb9b5dbc8e84d04 (patch)
treedd6c3b4dc64a17c520af7aaf213163f8a0a63e56 /sandbox-systrace.c
parentac2b4c0697fcac554041ab95f81736887eadf6ec (diff)
parenta2dabf35ce0228c86a288d11cc847a9d9801604f (diff)
New upstream release (8.2p1)
Diffstat (limited to 'sandbox-systrace.c')
-rw-r--r--sandbox-systrace.c6
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
114ssh_sandbox_child(struct ssh_sandbox *box) 114ssh_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",