From: Darren Tucker <dtucker@dtucker.net>
Date: Tue, 8 Nov 2022 22:23:47 +0000 (+1100)
Subject: Defer seed_rng until after closefrom call.
X-Git-Tag: V_9_2_P1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1a9852d7fc93e4abc4168aed09529a57427cdc;p=thirdparty%2Fopenssh-portable.git

Defer seed_rng until after closefrom call.

seed_rng will initialize OpenSSL, and some engine providers (eg Intel's
QAT) will open descriptors for their own use.  bz#3483, patch from
joel.d.schuetze at intel.com, ok djm@
---

diff --git a/sshd.c b/sshd.c
index b4bb7d654..808d91ef2 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1580,8 +1580,6 @@ main(int ac, char **av)
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
 	sanitise_stdfd();
 
-	seed_rng();
-
 	/* Initialize configuration options to their default values. */
 	initialize_server_options(&options);
 
@@ -1703,6 +1701,8 @@ main(int ac, char **av)
 	else
 		closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
 
+	seed_rng();
+
 	/* If requested, redirect the logs to the specified logfile. */
 	if (logfile != NULL)
 		log_redirect_stderr_to(logfile);