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/auth2-pubkey.c b/auth2-pubkey.c
index b656b1f8c..5b4a2cc02 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.97 2019/11/25 00:54:23 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.98 2020/01/23 07:10:22 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -460,7 +460,7 @@ match_principals_command(struct ssh *ssh, struct passwd *user_pw,
          * NB. all returns later this function should go via "out" to
          * ensure the original SIGCHLD handler is restored properly.
          */
-        osigchld = signal(SIGCHLD, SIG_DFL);
+        osigchld = ssh_signal(SIGCHLD, SIG_DFL);
 
         /* Prepare and verify the user for the command */
         username = percent_expand(options.authorized_principals_command_user,
@@ -548,7 +548,7 @@ match_principals_command(struct ssh *ssh, struct passwd *user_pw,
  out:
         if (f != NULL)
                 fclose(f);
-        signal(SIGCHLD, osigchld);
+        ssh_signal(SIGCHLD, osigchld);
         for (i = 0; i < ac; i++)
                 free(av[i]);
         free(av);
@@ -898,7 +898,7 @@ user_key_command_allowed2(struct ssh *ssh, struct passwd *user_pw,
          * NB. all returns later this function should go via "out" to
          * ensure the original SIGCHLD handler is restored properly.
          */
-        osigchld = signal(SIGCHLD, SIG_DFL);
+        osigchld = ssh_signal(SIGCHLD, SIG_DFL);
 
         /* Prepare and verify the user for the command */
         username = percent_expand(options.authorized_keys_command_user,
@@ -987,7 +987,7 @@ user_key_command_allowed2(struct ssh *ssh, struct passwd *user_pw,
  out:
         if (f != NULL)
                 fclose(f);
-        signal(SIGCHLD, osigchld);
+        ssh_signal(SIGCHLD, osigchld);
         for (i = 0; i < ac; i++)
                 free(av[i]);
         free(av);