tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2015-11-19 08:23:27 +00:00 committed by Damien Miller
parent 964ab3ee7a
commit 88b6fcdeb8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1096,6 +1096,8 @@ main(int ac, char **av)
"disabling"); "disabling");
options.update_hostkeys = 0; options.update_hostkeys = 0;
} }
if (options.connection_attempts <= 0)
fatal("Invalid number of ConnectionAttempts");
#ifndef HAVE_CYGWIN #ifndef HAVE_CYGWIN
if (original_effective_uid != 0) if (original_effective_uid != 0)
options.use_privileged_port = 0; options.use_privileged_port = 0;

4
sshconnect.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; struct addrinfo *ai;
debug2("%s: needpriv %d", __func__, needpriv); debug2("%s: needpriv %d", __func__, needpriv);
memset(ntop, 0, sizeof(ntop));
memset(strport, 0, sizeof(strport));
for (attempt = 0; attempt < connection_attempts; attempt++) { for (attempt = 0; attempt < connection_attempts; attempt++) {
if (attempt > 0) { if (attempt > 0) {