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, 10 insertions, 10 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 0d2523ca1..0ad44ce19 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.305 2019/05/31 03:20:07 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.306 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1408,7 +1408,7 @@ load_identity_file(Identity *id)
         int r, perm_ok = 0, quit = 0, i;
         struct stat st;
 
-        if (stat(id->filename, &st) < 0) {
+        if (stat(id->filename, &st) == -1) {
                 (id->userprovided ? logit : debug3)("no such identity: %s: %s",
                     id->filename, strerror(errno));
                 return NULL;
@@ -1841,7 +1841,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
         *sigp = NULL;
         *lenp = 0;
 
-        if (stat(_PATH_SSH_KEY_SIGN, &st) < 0) {
+        if (stat(_PATH_SSH_KEY_SIGN, &st) == -1) {
                 error("%s: not installed: %s", __func__, strerror(errno));
                 return -1;
         }
@@ -1849,30 +1849,30 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
                 error("%s: fflush: %s", __func__, strerror(errno));
                 return -1;
         }
-        if (pipe(to) < 0) {
+        if (pipe(to) == -1) {
                 error("%s: pipe: %s", __func__, strerror(errno));
                 return -1;
         }
-        if (pipe(from) < 0) {
+        if (pipe(from) == -1) {
                 error("%s: pipe: %s", __func__, strerror(errno));
                 return -1;
         }
-        if ((pid = fork()) < 0) {
+        if ((pid = fork()) == -1) {
                 error("%s: fork: %s", __func__, strerror(errno));
                 return -1;
         }
         osigchld = signal(SIGCHLD, SIG_DFL);
         if (pid == 0) {
                 close(from[0]);
-                if (dup2(from[1], STDOUT_FILENO) < 0)
+                if (dup2(from[1], STDOUT_FILENO) == -1)
                         fatal("%s: dup2: %s", __func__, strerror(errno));
                 close(to[1]);
-                if (dup2(to[0], STDIN_FILENO) < 0)
+                if (dup2(to[0], STDIN_FILENO) == -1)
                         fatal("%s: dup2: %s", __func__, strerror(errno));
                 close(from[1]);
                 close(to[0]);
 
-                if (dup2(sock, STDERR_FILENO + 1) < 0)
+                if (dup2(sock, STDERR_FILENO + 1) == -1)
                         fatal("%s: dup2: %s", __func__, strerror(errno));
                 sock = STDERR_FILENO + 1;
                 fcntl(sock, F_SETFD, 0);        /* keep the socket on exec */
@@ -1906,7 +1906,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
         }
 
         errno = 0;
-        while (waitpid(pid, &status, 0) < 0) {
+        while (waitpid(pid, &status, 0) == -1) {
                 if (errno != EINTR) {
                         error("%s: waitpid %ld: %s",
                             __func__, (long)pid, strerror(errno));