upstream: ignore SIGPIPE earlier in main(), specifically before

muxclient() which performs operations that could cause one; Reported by Noam
Lewis via bz3454, ok dtucker@

OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47

diff --git a/ssh.c b/ssh.c
index 89ca1940c1ff6b8e14cd2269ddb704a73e98fa00..559bf2affb213be442df9a8ab6246f29bb6e9abb 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.574 2022/03/30 04:33:09 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.575 2022/07/01 00:36:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1124,6 +1124,8 @@ main(int ac, char **av)
                }
        }
 
+       ssh_signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
+
        /*
         * Initialize "log" output.  Since we are the client all output
         * goes to stderr unless otherwise specified by -y or -E.
@@ -1652,7 +1654,6 @@ main(int ac, char **av)
            options.num_system_hostfiles);
        tilde_expand_paths(options.user_hostfiles, options.num_user_hostfiles);
 
-       ssh_signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
        ssh_signal(SIGCHLD, main_sigchld_handler);
 
        /* Log into the remote system.  Never returns if the login fails. */