Smatch fixes

12 files changed, 31 insertions, 40 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/config_parse.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/config_parse.c
index d02f337d8c..0e1f19b126 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/config_parse.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/config_parse.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2018, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 #include <arpa/inet.h>
 #include <bunyan.h>
@@ -850,8 +850,6 @@ parse_encrbits(input_cursor_t *restrict ic, config_xf_t *restrict xf)
 
 	if (!parse_int(t->t_str, &val))
 		goto invalid;
-	if (val > SIZE_MAX)
-		goto toobig;
 	xf->xf_minbits = (size_t)val;
 	tok_free(t);
 
@@ -870,8 +868,6 @@ parse_encrbits(input_cursor_t *restrict ic, config_xf_t *restrict xf)
 		goto truncated;
 	if (!parse_int(t->t_str, &val))
 		goto invalid;
-	if (val > SIZE_MAX)
-		goto toobig;
 	xf->xf_maxbits = val;
 
 	if (xf->xf_maxbits < xf->xf_minbits) {
@@ -913,15 +909,6 @@ invalid:
 	tok_free(t);
 	return (B_FALSE);
 
-toobig:
-	(void) bunyan_error(log, "Keysize is too large",
-	    BUNYAN_T_UINT64, "keysize", val,
-	    BUNYAN_T_UINT32, "line", t->t_line,
-	    BUNYAN_T_UINT32, "col", t->t_col,
-	    BUNYAN_T_END);
-	tok_free(t);
-	return (B_FALSE);
-
 truncated:
 	tok_free(t);
 	(void) bunyan_error(log, "Truncated input while reading transform",
@@ -1539,7 +1526,7 @@ tok_log(const token_t *restrict t, bunyan_level_t level, const char *msg,
 
 	(void) strlcpy(linecpy, t->t_linep, len);
 
-	getlog(level)(log, msg,
+	(void) getlog(level)(log, msg,
 	    BUNYAN_T_STRING, "line", linecpy,
 	    BUNYAN_T_UINT32, "lineno", t->t_line + 1,
 	    BUNYAN_T_UINT32, "col", t->t_col + 1,
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h
index 54cc517f50..c8aaea9fdb 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  *
  * Copyright 2017 Jason King.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #ifndef _DEFS_H
@@ -136,7 +136,8 @@ typedef struct algindex {
 
 #define	SSTOSA(ss) ((struct sockaddr *)(ss))
 
-#define	INVALID(var) assfail("Invalid value of " # var, __FILE__, __LINE__)
+#define	INVALID(var) \
+    (void) assfail("Invalid value of " # var, __FILE__, __LINE__)
 
 #ifndef ARRAY_SIZE
 #define	ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0]))
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/door.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/door.c
index 6496494e72..fbd69b1339 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/door.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/door.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2018, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <sys/stat.h>
@@ -36,7 +36,7 @@ send_error(ike_svccmd_t cmd, uint32_t ike_err, uint32_t unix_err)
 		.ike_err_unix = unix_err
 	};
 
-	door_return((char *)&ierr, sizeof (ierr), NULL, 0);
+	(void) door_return((char *)&ierr, sizeof (ierr), NULL, 0);
 }
 
 static void
@@ -109,6 +109,9 @@ ikev2_door_init(const char *path)
 	fd = open(path, O_RDWR | O_CREAT | O_EXCL, 0644);
 	(void) umask(oldmask);
 
+	if (fd >= 0)
+		(void) close(fd);
+
 	if (fattach(door_fd, path) < 0) {
 		if ((errno != EBUSY) || fdetach(path) < 0 ||
 		    fattach(door_fd, path) < 0)
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_child_sa.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_child_sa.c
index df8c661eb5..0f72d27e62 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_child_sa.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_child_sa.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <ipsec_util.h>
@@ -783,8 +783,8 @@ remote_fail:
 		pfkey_send_error(pmsg->pmsg_samsg, EINVAL);
 }
 
-static void ikev2_hard_expire_reply(ikev2_sa_t *restrict, pkt_t *restrict,
-    void *restrict);
+// XXX static void ikev2_hard_expire_reply(ikev2_sa_t *restrict, pkt_t *restrict,
+// XXX    void *restrict);
 
 void
 ikev2_hard_expire(ikev2_sa_t *restrict i2sa, parsedmsg_t *pmsg)
@@ -2101,7 +2101,7 @@ ikev2_get_rekey_csa(ikev2_sa_t *restrict i2sa, pkt_t *restrict req,
     pkt_t *restrict resp, ikev2_child_sa_t *restrict *csap)
 {
 	pkt_notify_t *rekey_n = pkt_get_notify(req, IKEV2_N_REKEY_SA, NULL);
-	uint8_t *spiptr = rekey_n->pn_ptr;
+	// XXX: uint8_t *spiptr = rekey_n->pn_ptr;
 	uint32_t spi = 0;
 
 	VERIFY(!I2P_RESPONSE(req));
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_pkt.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_pkt.c
index bf13b2c7cb..67210aea2e 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_pkt.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_pkt.c
@@ -11,7 +11,7 @@
 
 /*
  * Copyright 2017 Jason King.
- * Copyright 2018, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <stddef.h>
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
-#include <libcmdutils.h> /* for custr_ */
+#include <libcustr.h>
 #include <netinet/in.h>
 #include <security/cryptoki.h>
 #include <errno.h>
@@ -1275,7 +1275,7 @@ ikev2_pkt_log(pkt_t *restrict pkt, bunyan_level_t level, const char *msg)
 		(void) strlcat(flag, ">", sizeof (flag));
 	}
 
-	getlog(level)(log, msg,
+	(void) getlog(level)(log, msg,
 	    BUNYAN_T_POINTER, "pkt", pkt,
 	    BUNYAN_T_STRING, "initiator_spi", ispi,
 	    BUNYAN_T_STRING, "responder_spi", rspi,
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_proto.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_proto.c
index 21af4825f4..b34431d648 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_proto.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_proto.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  *
  * Copyright 2017 Jason King.
- * Copyright 2018, Joyent, Inc
+ * Copyright 2019 Joyent, Inc
  */
 
 #include <errno.h>
 #include <ipsec_util.h>
-#include <libcmdutils.h>
+#include <libcustr.h>
 #include <libperiodic.h>
 #include <note.h>
 #include <string.h>
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa.c
index 2784e06253..6e424ab932 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  *
  * Copyright 2017 Jason King.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -1264,7 +1264,7 @@ i2sa_rspi_cmp(const void *larg, const void *rarg)
 
 	if (ni_l_len < ni_r_len)
 		return (-1);
-	if (ni_r_len > ni_r_len)
+	if (ni_l_len > ni_r_len)
 		return (1);
 	return (0);
 }
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa_init.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa_init.c
index 16d3750719..b8709f3d70 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa_init.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/ikev2_sa_init.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (c) 2017 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <bunyan.h>
@@ -367,7 +367,7 @@ ikev2_sa_init_init_resp(ikev2_sa_t *restrict sa, pkt_t *restrict pkt,
 	ikev2_save_nonce(sa_args, pkt);
 
 	/* And the responder IKE_SA_INIT packet */
-	ikev2_save_init_pkt(sa_args, pkt);
+	(void) ikev2_save_init_pkt(sa_args, pkt);
 
 	/*
 	 * The generated keys use the initiator/responder SPI values from
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/main.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/main.c
index e62b8bd925..6aa19fc894 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/main.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/main.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <bunyan.h>
@@ -148,7 +148,7 @@ nofail_cb(void)
 	 * checks -- e.g. that we're not allowing a remote peer to get us
 	 * to allocate 1Tb of ram, etc.).
 	 */
-	assfail("Out of memory", __FILE__, __LINE__);
+	(void) assfail("Out of memory", __FILE__, __LINE__);
 	/*NOTREACHED*/
 	return (UMEM_CALLBACK_EXIT(EXIT_FAILURE));
 }
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pfkey.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pfkey.c
index 80f7c293c8..cd6210ad24 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pfkey.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pfkey.c
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  *
  * Copyright 2017 Jason King.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 #include <arpa/inet.h>
 #include <atomic.h>
@@ -1675,7 +1675,7 @@ sadb_log(bunyan_level_t level, const char *restrict msg,
 		ext = (sadb_ext_t *)((uint64_t *)ext + ext->sadb_ext_len);
 	}
 
-	logf(log, msg,
+	(void) logf(log, msg,
 	    BUNYAN_T_STRING, "msg_type",
 	    pfkey_op_str(samsg->sadb_msg_type),
 	    BUNYAN_T_STRING, "sa_type",
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pkt.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pkt.c
index 69d616ccc3..94344e299f 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pkt.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/pkt.c
@@ -11,7 +11,7 @@
 
 /*
  * Copyright 2017 Jason King.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 #include <stddef.h>
 #include <assert.h>
@@ -143,7 +143,7 @@ pkt_check_payloads(uint8_t first, const uint8_t *buf, size_t buflen,
 			    BUNYAN_T_UINT32, "paytype", (uint32_t)type,
 			    BUNYAN_T_UINT32, "paylen", (uint32_t)paylen,
 			    BUNYAN_T_END);
-				return (B_FALSE);
+			return (B_FALSE);
 		}
 
 		if (!cb(type, ptr + sizeof (*pay), paylen - sizeof (*pay)))
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/worker.c b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/worker.c
index d18a7cc161..1b6d405e7a 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/worker.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/worker.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2018, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <bunyan.h>
@@ -394,7 +394,7 @@ worker_log_lifetime(boolean_t start)
 	if (worker_state != WS_RUNNING && worker_state != WS_QUITTING)
 		level = BUNYAN_L_INFO;
 
-	getlog(level)(log, msg, BUNYAN_T_END);
+	(void) getlog(level)(log, msg, BUNYAN_T_END);
 }
 
 static void *