From: Damien Miller <djm@mindrot.org>
Date: Wed, 14 Apr 2021 01:42:55 +0000 (+1000)
Subject: sshd don't exit on transient read errors
X-Git-Tag: V_8_6_P1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc328023f60212cd29504fc05d849133ae47355;p=thirdparty%2Fopenssh-portable.git

sshd don't exit on transient read errors

openssh-8.5 introduced a regression that would cause sshd to exit
because of transient read errors on the network socket (e.g. EINTR,
EAGAIN). Reported by balu.gajjala AT gmail.com via bz3297
---

diff --git a/serverloop.c b/serverloop.c
index 669179718..70a20ab49 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -333,7 +333,7 @@ process_input(struct ssh *ssh, fd_set *readset, int connection_in)
 			return -1;
 		} else if (len == -1) {
 			if (errno == EINTR || errno == EAGAIN ||
-			    errno != EWOULDBLOCK)
+			    errno == EWOULDBLOCK)
 				return 0;
 			verbose("Read error from remote host %s port %d: %s",
 			    ssh_remote_ipaddr(ssh), ssh_remote_port(ssh),