From: deraadt@openbsd.org <deraadt@openbsd.org>
Date: Fri, 12 Nov 2021 05:23:49 +0000 (+0000)
Subject: upstream: aggressively pre-fill the pollfd array with fd=-1
X-Git-Tag: V_8_9_P1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06acb04c20ee483fe4757bd12aec870cc4bb1076;p=thirdparty%2Fopenssh-portable.git

upstream: aggressively pre-fill the pollfd array with fd=-1

OpenBSD-Commit-ID: c2a525de8f83c1a04405bd79122c424140552a5b
---

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 4cc3cf776..b0c530f31 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.141 2021/11/11 15:32:32 deraadt Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.142 2021/11/12 05:23:49 deraadt Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -773,6 +773,8 @@ main(int argc, char **argv)
 		fdlim_set(maxfd);
 	fdcon = xcalloc(maxfd, sizeof(con));
 	read_wait = xcalloc(maxfd, sizeof(struct pollfd));
+	for (j = 0; j < maxfd; j++)
+		read_wait[j].fd = -1;
 
 	for (j = 0; j < fopt_count; j++) {
 		if (argv[j] == NULL)