upstream commit

ban ConnectionAttempts=0, it makes no sense and would cause
 ssh_connect_direct() to print an uninitialised stack variable; bz#2500
 reported by dvw AT phas.ubc.ca

Upstream-ID: 32b5134c608270583a90b93a07b3feb3cbd5f7d5

diff --git a/ssh.c b/ssh.c
index cceb36e838ca0417d6b8d87126b6906a77ae34b8..38e2b66748fbfc9fd2cfb700d6d334db1425068c 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.429 2015/10/25 23:42:00 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.430 2015/11/19 08:23:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1096,6 +1096,8 @@ main(int ac, char **av)
                    "disabling");
                options.update_hostkeys = 0;
        }
+       if (options.connection_attempts <= 0)
+               fatal("Invalid number of ConnectionAttempts");
 #ifndef HAVE_CYGWIN
        if (original_effective_uid != 0)
                options.use_privileged_port = 0;

diff --git a/sshconnect.c b/sshconnect.c
index 1507934d878d79fe2a3c59d69f001d34fbb74dd3..b2c878a50cdff284ffabd28c7e9e4dd3d85de0ec 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.267 2015/11/19 01:09:38 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.268 2015/11/19 08:23:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -434,6 +434,8 @@ ssh_connect_direct(const char *host, struct addrinfo *aitop,
        struct addrinfo *ai;
 
        debug2("%s: needpriv %d", __func__, needpriv);
+       memset(ntop, 0, sizeof(ntop));
+       memset(strport, 0, sizeof(strport));
 
        for (attempt = 0; attempt < connection_attempts; attempt++) {
                if (attempt > 0) {