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

1 files changed, 5 insertions, 5 deletions

diff --git a/serverloop.c b/serverloop.c
index 99d259201..1babc7a51 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.218 2019/11/27 05:38:43 dtucker Exp $ */
+/* $OpenBSD: serverloop.c,v 1.219 2020/01/23 07:10:22 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -402,15 +402,15 @@ server_loop2(struct ssh *ssh, Authctxt *authctxt)
 
         debug("Entering interactive session for SSH2.");
 
-        signal(SIGCHLD, sigchld_handler);
+        ssh_signal(SIGCHLD, sigchld_handler);
         child_terminated = 0;
         connection_in = ssh_packet_get_connection_in(ssh);
         connection_out = ssh_packet_get_connection_out(ssh);
 
         if (!use_privsep) {
-                signal(SIGTERM, sigterm_handler);
-                signal(SIGINT, sigterm_handler);
-                signal(SIGQUIT, sigterm_handler);
+                ssh_signal(SIGTERM, sigterm_handler);
+                ssh_signal(SIGINT, sigterm_handler);
+                ssh_signal(SIGQUIT, sigterm_handler);
         }
 
         notify_setup();