Tue Dec 17 18:16:05 2019 UTC ()

ksem_sysinit(): more lossage.


(ad)

diff -r1.57 -r1.58 src/sys/kern/uipc_sem.c

--- src/sys/kern/uipc_sem.c 2019/12/17 18:10:36	1.57
+++ src/sys/kern/uipc_sem.c 2019/12/17 18:16:05	1.58

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_sem.c,v 1.57 2019/12/17 18:10:36 ad Exp $	*/
+/*	$NetBSD: uipc_sem.c,v 1.58 2019/12/17 18:16:05 ad Exp $	*/
 /*-
  * Copyright (c) 2011, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mindaugas Rasiukevicius and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Implementation of POSIX semaphore.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.57 2019/12/17 18:10:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.58 2019/12/17 18:16:05 ad Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/proc.h>
 #include <sys/lwp.h>
 #include <sys/ksem.h>
 #include <sys/syscall.h>
 #include <sys/stat.h>
 #include <sys/kmem.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 @@ -194,57 +194,57 @@ ksem_sysinit(void)
 	int error;
 	const struct sysctlnode *rnode;
 	mutex_init(&ksem_lock, MUTEX_DEFAULT, IPL_NONE);
 	LIST_INIT(&ksem_head);
 	nsems_total = 0;
 	nsems = 0;
 	rw_init(&ksem_pshared_lock);
 	ksem_pshared_hashtab = hashinit(KSEM_PSHARED_HASHSIZE, HASH_LIST,
 	    true, &ksem_pshared_hashmask);
 	KASSERT(ksem_pshared_hashtab != NULL);
 	error = syscall_establish(NULL, ksem_syscalls);
 	if (error) {
 		(void)ksem_sysfini(false);
 	ksem_listener = kauth_listen_scope(KAUTH_SCOPE_SYSTEM,
 	    ksem_listener_cb, NULL);
 	/* Define module-specific sysctl tree */
 	ksem_clog = NULL;
 	sysctl_createv(&ksem_clog, 0, NULL, &rnode,
 			CTLFLAG_PERMANENT,
 			CTLTYPE_NODE, "posix",
 			SYSCTL_DESCR("POSIX options"),
 			NULL, 0, NULL, 0,
 			CTL_KERN, CTL_CREATE, CTL_EOL);
 	sysctl_createv(&ksem_clog, 0, &rnode, NULL,
 			CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
 			CTLTYPE_INT, "semmax",
 			SYSCTL_DESCR("Maximal number of semaphores"),
 			NULL, 0, &ksem_max, 0,
 			CTL_CREATE, CTL_EOL);
 	sysctl_createv(&ksem_clog, 0, &rnode, NULL,
 			CTLFLAG_PERMANENT | CTLFLAG_READONLY,
 			CTLTYPE_INT, "semcnt",
 			SYSCTL_DESCR("Current number of semaphores"),
 			NULL, 0, &nsems, 0,
 			CTL_CREATE, CTL_EOL);
 	error = syscall_establish(NULL, ksem_syscalls);
 	if (error) {
 		(void)ksem_sysfini(false);
+	}
 	return error;
+}
 static int
 ksem_sysfini(bool interface)
+{
 	int error;
 	if (interface) {
 		error = syscall_disestablish(NULL, ksem_syscalls);
 		if (error != 0) {
 			return error;
+		}