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

diff --git a/monitor.c b/monitor.c
index 60e529444..96d10913c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.197 2019/01/21 10:38:54 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.198 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1470,7 +1470,7 @@ mm_record_login(struct ssh *ssh, Session *s, struct passwd *pw)
         fromlen = sizeof(from);
         if (ssh_packet_connection_is_on_socket(ssh)) {
                 if (getpeername(ssh_packet_get_connection_in(ssh),
-                    (struct sockaddr *)&from, &fromlen) < 0) {
+                    (struct sockaddr *)&from, &fromlen) == -1) {
                         debug("getpeername: %.100s", strerror(errno));
                         cleanup_exit(255);
                 }
@@ -1538,7 +1538,7 @@ mm_answer_pty(struct ssh *ssh, int sock, struct sshbuf *m)
                 fatal("%s: send fds failed", __func__);
 
         /* make sure nothing uses fd 0 */
-        if ((fd0 = open(_PATH_DEVNULL, O_RDONLY)) < 0)
+        if ((fd0 = open(_PATH_DEVNULL, O_RDONLY)) == -1)
                 fatal("%s: open(/dev/null): %s", __func__, strerror(errno));
         if (fd0 != 0)
                 error("%s: fd0 %d != 0", __func__, fd0);
@@ -1730,9 +1730,9 @@ monitor_openfds(struct monitor *mon, int do_logfds)
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
                 fatal("%s: socketpair: %s", __func__, strerror(errno));
 #ifdef SO_ZEROIZE
-        if (setsockopt(pair[0], SOL_SOCKET, SO_ZEROIZE, &on, sizeof(on)) < 0)
+        if (setsockopt(pair[0], SOL_SOCKET, SO_ZEROIZE, &on, sizeof(on)) == -1)
                 error("setsockopt SO_ZEROIZE(0): %.100s", strerror(errno));
-        if (setsockopt(pair[1], SOL_SOCKET, SO_ZEROIZE, &on, sizeof(on)) < 0)
+        if (setsockopt(pair[1], SOL_SOCKET, SO_ZEROIZE, &on, sizeof(on)) == -1)
                 error("setsockopt SO_ZEROIZE(1): %.100s", strerror(errno));
 #endif
         FD_CLOSEONEXEC(pair[0]);