Commit Diff

Commit:
e475725efdaacc720c9b0f5c3ba9cf6300c5d73b
From:
deraadt <deraadt@openbsd.org>
Date:
Message:
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.
Actions:
Patch | Tree
commit - 0c91187da1707fc65869cc8b4fd03050eac43f3d
commit + e475725efdaacc720c9b0f5c3ba9cf6300c5d73b
blob - 1b2557c25fc6d79716921dd1a7c9f2a26b2d874b
blob + 3d251b28651f6cbfa5183991d274dc9c84269be4
--- check_icmp.c
+++ check_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_icmp.c,v 1.47 2017/07/12 22:57:40 jca Exp $	*/
+/*	$OpenBSD: check_icmp.c,v 1.48 2019/06/28 13:32:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -52,7 +52,7 @@ icmp_setup(struct relayd *env, struct ctl_icmp_event *
 
 	if (af == AF_INET6)
 		proto = IPPROTO_ICMPV6;
-	if ((cie->s = socket(af, SOCK_RAW | SOCK_NONBLOCK, proto)) < 0)
+	if ((cie->s = socket(af, SOCK_RAW | SOCK_NONBLOCK, proto)) == -1)
 		fatal("%s: socket", __func__);
 	val = ICMP_RCVBUF_SIZE;
 	if (setsockopt(cie->s, SOL_SOCKET, SO_RCVBUF, &val, sizeof(val)) == -1)
blob - 6cdbba67d5f99b63577c074a8e9f67beeb6a83ad
blob + 0d46ae200959083645e9278b0e9223de0abe7d7c
--- parse.y
+++ parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.238 2019/05/31 15:25:57 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.239 2019/06/28 13:32:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -3385,7 +3385,7 @@ is_if_in_group(const char *ifname, const char *groupna
 	int			 s;
 	int			 ret = 0;
 
-	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
 		err(1, "socket");
 
 	memset(&ifgr, 0, sizeof(ifgr));
blob - 7ec8f0ec41a8160dbfe8d5923f0e3ffb39b9f15e
blob + 864d9104fbe471e87d4400f853922e8f8bff5057
--- relay.c
+++ relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.248 2019/06/26 12:13:47 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.249 2019/06/28 13:32:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -2504,7 +2504,7 @@ relay_tls_readcb(int fd, short event, void *arg)
 	ret = tls_read(cre->tls, rbuf, howmuch);
 	if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) {
 		goto retry;
-	} else if (ret < 0) {
+	} else if (ret == -1) {
 		what |= EVBUFFER_ERROR;
 		goto err;
 	}
@@ -2563,7 +2563,7 @@ relay_tls_writecb(int fd, short event, void *arg)
 		    EVBUFFER_LENGTH(bufev->output));
 		if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) {
 			goto retry;
-		} else if (ret < 0) {
+		} else if (ret == -1) {
 			what |= EVBUFFER_ERROR;
 			goto err;
 		}