10703 smatch unreachable code checking needs reworking

Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Approved by: Dan McDonald <danmcd@joyent.com>
illumos · Aug 21, 2019 · 44bf619 · 44bf619
1 parent a99cb96
commit 44bf619
Show file tree

Hide file tree

Showing 48 changed files with 110 additions and 177 deletions.
diff --git a/usr/src/Makefile.smatch b/usr/src/Makefile.smatch
@@ -16,7 +16,7 @@
 # simply too much legacy).
 #
 
-SMATCH_ARGS = --disable=uninitialized,check_check_deref,unreachable
+SMATCH_ARGS = --disable=uninitialized,check_check_deref
 
 # VLAs are OK by us
 SMATCH_ARGS += -Wno-vla

diff --git a/usr/src/cmd/ctfmerge/ctfmerge.c b/usr/src/cmd/ctfmerge/ctfmerge.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (c) 2019, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -47,7 +47,7 @@ static uint_t g_nctf;
 #define	CTFMERGE_DEFAULT_NTHREADS	8
 #define	CTFMERGE_ALTEXEC	"CTFMERGE_ALTEXEC"
 
-static void
+static void __attribute__((__noreturn__))
 ctfmerge_fatal(const char *fmt, ...)
 {
 	va_list ap;

diff --git a/usr/src/cmd/cxgbetool/cxgbetool.c b/usr/src/cmd/cxgbetool/cxgbetool.c
@@ -13,6 +13,10 @@
  * Copyright (c) 2018 by Chelsio Communications, Inc.
  */
 
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -85,7 +89,7 @@ static void usage(FILE *fp)
 	exit(fp == stderr ? 1 : 0);
 }
 
-static void
+__NORETURN static void
 err(int code, const char *fmt, ...)
 {
 	va_list ap;

diff --git a/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_outbound.c b/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_outbound.c
@@ -23,6 +23,10 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <strings.h>
 #include <fm/fmd_api.h>
@@ -112,7 +116,6 @@ fmevt_init_outbound(fmd_hdl_t *hdl)
 	    EVCH_CREAT | EVCH_HOLD_PEND_INDEF) != 0) {
 		fmd_hdl_abort(hdl, "Unable to bind channel %s",
 		    channel_name);
-		return;
 	}
 
 	channel_depth = fmd_prop_get_int32(hdl, "outbound_channel_depth");

diff --git a/usr/src/cmd/fs.d/reparsed/reparsed.c b/usr/src/cmd/fs.d/reparsed/reparsed.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2018, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -187,7 +187,7 @@ main(int argc, char *argv[])
 	return (start_reparsed_svcs());
 }
 
-static void
+__NORETURN static void
 reparsed_door_call_error(int error, int buflen)
 {
 	reparsed_door_res_t rpd_res;
@@ -354,10 +354,6 @@ start_reparsed_svcs()
 	/*
 	 * Wait for incoming calls
 	 */
-	/*CONSTCOND*/
 	while (1)
 		(void) pause();
-
-	syslog(LOG_ERR, "Door server exited");
-	return (10);
 }
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_main.c b/usr/src/cmd/mdb/common/mdb/mdb_main.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <sys/types.h>
@@ -1098,7 +1098,6 @@ main(int argc, char *argv[], char *envp[])
 	terminate((status == MDB_ERR_QUIT || status == 0) ?
 	    (eflag != NULL && mdb.m_lastret != 0 ? 1 : 0) : 1);
 	/*NOTREACHED*/
-	return (0);
 
 reexec:
 	if ((p = strrchr(execname, '/')) == NULL)

diff --git a/usr/src/cmd/od/od.c b/usr/src/cmd/od/od.c
@@ -13,6 +13,10 @@
  * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  */
 
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
 /*
  * od - octal dump.  Not really just octal anymore; read the POSIX
  * specification for it -- its more complex than you think!
@@ -533,7 +537,6 @@ do_type_string(char *typestr)
 		default:
 			errx(1, _("unrecognized type string character: %c"),
 			    *typestr);
-			exit(1);
 		}
 	}
 }

diff --git a/usr/src/cmd/sgs/libld/common/map_core.c b/usr/src/cmd/sgs/libld/common/map_core.c
@@ -24,6 +24,8 @@
  *	  All Rights Reserved
  *
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -2073,10 +2075,6 @@ ld_map_gettoken(Mapfile *mf, int flags, ld_map_tkval_t *tkv)
 			return (tok);
 		}
 	}
-
-	/*NOTREACHED*/
-	assert(0);
-	return (TK_ERROR);
 }
 
 /*

diff --git a/usr/src/cmd/sgs/libld/common/map_support.c b/usr/src/cmd/sgs/libld/common/map_support.c
@@ -28,7 +28,7 @@
  */
 
 /*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -84,8 +84,6 @@ ld_map_kwfind(const char *name, void *array, size_t name_offset,
 	}
 
 	/*NOTREACHED*/
-	assert(0);
-	return (NULL);
 }
 #endif
 
@@ -199,7 +197,7 @@ ld_map_cap_set_ovflag(Mapfile *mf, Word type)
 	 * override flag.
 	 */
 	static ofl_flag_t override_flag[CA_SUNW_NUM] = {
-		0, 			/* CA_SUNW_NULL */
+		0,			/* CA_SUNW_NULL */
 		FLG_OF1_OVHWCAP1,	/* CA_SUNW_HW_1 */
 		FLG_OF1_OVSFCAP1,	/* CA_SUNW_SF_1 */
 		FLG_OF1_OVHWCAP2,	/* CA_SUNW_HW_2 */

diff --git a/usr/src/cmd/sgs/libld/common/map_v2.c b/usr/src/cmd/sgs/libld/common/map_v2.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
+
 /*
  * Map file parsing, Version 2 syntax (solaris).
  */
@@ -3318,8 +3322,4 @@ ld_map_parse_v2(Mapfile *mf)
 			return (FALSE);
 		}
 	}
-
-	/*NOTREACHED*/
-	assert(0);
-	return (FALSE);
 }
diff --git a/usr/src/cmd/svc/configd/client.c b/usr/src/cmd/svc/configd/client.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015 RackTop Systems.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -1988,7 +1989,6 @@ start_audit_session(repcache_client_t *cp)
 		case EFAULT:
 		default:
 			bad_error("door_ucred", errno);
-			return;
 		}
 	}
 	if (adt_start_session(&session, NULL, 0) != 0) {

diff --git a/usr/src/cmd/svc/startd/graph.c b/usr/src/cmd/svc/startd/graph.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  * Copyright (c) 2015, Syneto S.R.L. All rights reserved.
  * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright 2016 RackTop Systems.
@@ -5817,14 +5817,6 @@ graph_event_thread(void *unused)
 
 		MUTEX_UNLOCK(&gu->gu_lock);
 	}
-
-	/*
-	 * Unreachable for now -- there's currently no graceful cleanup
-	 * called on exit().
-	 */
-	MUTEX_UNLOCK(&gu->gu_lock);
-	scf_handle_destroy(h);
-	return (NULL);
 }
 
 static void
@@ -6190,15 +6182,6 @@ graph_thread(void *arg)
 		(void) pthread_cond_wait(&gu->gu_freeze_cv,
 		    &gu->gu_freeze_lock);
 	}
-
-	/*
-	 * Unreachable for now -- there's currently no graceful cleanup
-	 * called on exit().
-	 */
-	(void) pthread_mutex_unlock(&gu->gu_freeze_lock);
-	scf_handle_destroy(h);
-
-	return (NULL);
 }
 
 

diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -2090,14 +2090,6 @@ restarter_event_thread(void *unused)
 			MUTEX_LOCK(&ru->restarter_update_lock);
 		}
 	}
-
-	/*
-	 * Unreachable for now -- there's currently no graceful cleanup
-	 * called on exit().
-	 */
-	(void) scf_handle_unbind(h);
-	scf_handle_destroy(h);
-	return (NULL);
 }
 
 static restarter_inst_t *

diff --git a/usr/src/cmd/svc/svcprop/svcprop.c b/usr/src/cmd/svc/svcprop/svcprop.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -630,8 +630,6 @@ process_pg(scf_propertygroup_t *pg)
 			    "has too many components for property "
 			    "group `%s'.\n"), spn->spn_comp1, spn->spn_comp2,
 			    buf);
-
-			free(buf);
 		}
 
 		if (scf_pg_get_property(pg, spn->spn_comp1, prop) == 0) {

diff --git a/usr/src/cmd/ul/Makefile b/usr/src/cmd/ul/Makefile
@@ -20,25 +20,26 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright 2019 Joyent, Inc.
+#
 
 PROG= ul
 
 include ../Makefile.cmd
 
 LDLIBS += -lcurses
 
+# false positive
+SMOFF += unreachable
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
 clean:
 
-lint:	lint_PROG
-
 include ../Makefile.targ
diff --git a/usr/src/cmd/zonecfg/Makefile b/usr/src/cmd/zonecfg/Makefile
@@ -22,7 +22,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
+#
 
 PROG=	zonecfg
 OBJS=	zonecfg.o zonecfg_lex.o zonecfg_grammar.tab.o
@@ -49,6 +50,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
 SMOFF += all_func_returns
 
+# false positive
+zonecfg_lex.o := SMOFF += free
+
 CLOBBERFILES += $(PROG).ln
 
 .KEEP_STATE:

diff --git a/usr/src/lib/brand/shared/brand/Makefile.com b/usr/src/lib/brand/shared/brand/Makefile.com
@@ -23,7 +23,7 @@
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
-# Copyright (c) 2019, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
 #
 
 COBJS =		brand_util.o
@@ -55,6 +55,9 @@ CPPFLAGS +=	-D_REENTRANT -U_ASM -I. -I../sys
 CFLAGS +=	$(CCVERBOSE)
 ASFLAGS =	-P $(ASFLAGS_$(CURTYPE)) -D_ASM -I. -I../sys
 
+# intentional code after abort()
+SMOFF += unreachable
+
 .KEEP_STATE:
 
 #
@@ -67,8 +70,6 @@ ASFLAGS =	-P $(ASFLAGS_$(CURTYPE)) -D_ASM -I. -I../sys
 #
 all: pics .WAIT $$(PICS)
 
-lint: lintcheck
-
 $(OBJECTS:%=pics/%): $(OFFSETS_H)
 
 $(OFFSETS_H): $(OFFSETS_SRC)