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

diff --git a/authfile.c b/authfile.c
index b1c92f4ad..2166c1689 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.131 2018/09/21 12:20:12 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.132 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *
@@ -57,7 +57,7 @@ sshkey_save_private_blob(struct sshbuf *keybuf, const char *filename)
 {
         int fd, oerrno;
 
-        if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600)) < 0)
+        if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600)) == -1)
                 return SSH_ERR_SYSTEM_ERROR;
         if (atomicio(vwrite, fd, sshbuf_mutable_ptr(keybuf),
             sshbuf_len(keybuf)) != sshbuf_len(keybuf)) {
@@ -101,7 +101,7 @@ sshkey_load_file(int fd, struct sshbuf *blob)
         struct stat st;
         int r;
 
-        if (fstat(fd, &st) < 0)
+        if (fstat(fd, &st) == -1)
                 return SSH_ERR_SYSTEM_ERROR;
         if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
             st.st_size > MAX_KEY_FILE_SIZE)
@@ -141,7 +141,7 @@ sshkey_perm_ok(int fd, const char *filename)
 {
         struct stat st;
 
-        if (fstat(fd, &st) < 0)
+        if (fstat(fd, &st) == -1)
                 return SSH_ERR_SYSTEM_ERROR;
         /*
          * if a key owned by the user is accessed, then we check the
@@ -176,7 +176,7 @@ sshkey_load_private_type(int type, const char *filename, const char *passphrase,
         if (commentp != NULL)
                 *commentp = NULL;
 
-        if ((fd = open(filename, O_RDONLY)) < 0) {
+        if ((fd = open(filename, O_RDONLY)) == -1) {
                 if (perm_ok != NULL)
                         *perm_ok = 0;
                 return SSH_ERR_SYSTEM_ERROR;
@@ -236,7 +236,7 @@ sshkey_load_private(const char *filename, const char *passphrase,
         if (commentp != NULL)
                 *commentp = NULL;
 
-        if ((fd = open(filename, O_RDONLY)) < 0)
+        if ((fd = open(filename, O_RDONLY)) == -1)
                 return SSH_ERR_SYSTEM_ERROR;
         if (sshkey_perm_ok(fd, filename) != 0) {
                 r = SSH_ERR_KEY_BAD_PERMISSIONS;