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/sshconnect.c b/sshconnect.c
index a2d759819..690240716 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.326 2020/01/22 07:38:30 dtucker Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.327 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
@@ -259,7 +259,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
 
                 /* Execute the proxy command.  Note that we gave up any
                    extra privileges above. */
-                signal(SIGPIPE, SIG_DFL);
+                ssh_signal(SIGPIPE, SIG_DFL);
                 execv(argv[0], argv);
                 perror(argv[0]);
                 exit(1);
@@ -1383,10 +1383,10 @@ ssh_local_cmd(const char *args)
         if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
                 shell = _PATH_BSHELL;
 
-        osighand = signal(SIGCHLD, SIG_DFL);
+        osighand = ssh_signal(SIGCHLD, SIG_DFL);
         pid = fork();
         if (pid == 0) {
-                signal(SIGPIPE, SIG_DFL);
+                ssh_signal(SIGPIPE, SIG_DFL);
                 debug3("Executing %s -c \"%s\"", shell, args);
                 execl(shell, shell, "-c", args, (char *)NULL);
                 error("Couldn't execute %s -c \"%s\": %s",
@@ -1397,7 +1397,7 @@ ssh_local_cmd(const char *args)
         while (waitpid(pid, &status, 0) == -1)
                 if (errno != EINTR)
                         fatal("Couldn't wait for child: %s", strerror(errno));
-        signal(SIGCHLD, osighand);
+        ssh_signal(SIGCHLD, osighand);
 
         if (!WIFEXITED(status))
                 return (1);