Increment nfds when coming from startup_pipe.

If we have to increase nfds because startup_pipe[0] is above any of the descriptors passed in the fd_sets, we also need to add 1 to nfds since select takes highest FD number plus one. bz#3345 from yaroslav.kuzmin at vmssoftware.com.
upstream: correct my mistake in previous fix; spotted by halex
2021-09-08 18:44:45 +10:00 · 2021-09-08 13:32:09 +10:00 · 2021-09-07 16:06:36 +10:00
2 changed files with 4 additions and 3 deletions
@@ -188,7 +188,7 @@ pselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
 	if (unmasked) {
 		pselect_notify_setup();
 		pselect_notify_prepare(readfds);
-		nfds = MAX(nfds, notify_pipe[0]);
+		nfds = MAX(nfds, notify_pipe[0] + 1);
 	}

 	/* Unmask signals, call select then restore signal mask. */
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.435 2021/08/11 08:54:17 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.437 2021/09/08 03:23:44 djm Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2680,7 +2680,8 @@ sig_process_opts(char * const *opts, size_t nopts, uint64_t *verify_timep,
 	time_t now;

 	*verify_timep = 0;
-	*print_pubkey = 0;
+	if (print_pubkey != NULL)
+		*print_pubkey = 0;
 	for (i = 0; i < nopts; i++) {
 		if (strncasecmp(opts[i], "verify-time=", 12) == 0) {
 			if (parse_absolute_time(opts[i] + 12,