upstream: When system calls indicate an error they return -1, not

some arbitrary value < 0.  errno is only updated in this case.  Change all
(most?) callers of syscalls to follow this better, and let's see if this
strictness helps us in the future.

OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075

1 files changed, 4 insertions, 4 deletions

diff --git a/serverloop.c b/serverloop.c
index d7b04b37c..ea468c954 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.215 2019/03/27 09:29:14 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.216 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -123,7 +123,7 @@ static int notify_pipe[2];
 static void
 notify_setup(void)
 {
-        if (pipe(notify_pipe) < 0) {
+        if (pipe(notify_pipe) == -1) {
                 error("pipe(notify_pipe) failed %s", strerror(errno));
         } else if ((fcntl(notify_pipe[0], F_SETFD, FD_CLOEXEC) == -1) ||
             (fcntl(notify_pipe[1], F_SETFD, FD_CLOEXEC) == -1)) {
@@ -328,7 +328,7 @@ process_input(struct ssh *ssh, fd_set *readset, int connection_in)
                         verbose("Connection closed by %.100s port %d",
                             ssh_remote_ipaddr(ssh), ssh_remote_port(ssh));
                         return -1;
-                } else if (len < 0) {
+                } else if (len == -1) {
                         if (errno != EINTR && errno != EAGAIN &&
                             errno != EWOULDBLOCK) {
                                 verbose("Read error from remote host "
@@ -384,7 +384,7 @@ collect_children(struct ssh *ssh)
         if (child_terminated) {
                 debug("Received SIGCHLD.");
                 while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
-                    (pid < 0 && errno == EINTR))
+                    (pid == -1 && errno == EINTR))
                         if (pid > 0)
                                 session_close_by_pid(ssh, pid, status);
                 child_terminated = 0;