 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL 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.
  */
 /*
  * Kernel module support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $");
 #define _MODULE_INTERNAL
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 @@ -656,27 +656,27 @@ module_unload(const char *name)
 	kernconfig_unlock();
 	return error;
+}
 /*
  * module_alias_lookup
+ *
  *	locate a name within a module's alias list
  */
 int
 module_alias_lookup(const char *name, module_t *mod)
+{
-	const char * const	aliasp[];
+	const char * const *aliasp;
 	aliasp = *mod->mod_info->mi_aliases;
 	if (aliasp == NULL)
 		return 0;
 	while (*aliasp)
 		if (strcmp(*aliasp++, name) == 0)
 			return 1;
 	return 0;
+}
 /*
  * module_lookup:
+ *
 @@ -774,27 +774,27 @@ module_enqueue(module_t *mod)
+}
 /*
  * module_do_builtin:
+ *
  *	Initialize a module from the list of modules that are
  *	already linked into the kernel.
  */
 static int
 module_do_builtin(const module_t *pmod, const char *name, module_t **modp,
     prop_dictionary_t props)
+{
 	const char *p, *s;
-	const char * const	aliasp[];
+	const char * const *aliasp;
 	char buf[MAXMODNAME];
 	modinfo_t *mi = NULL;
 	module_t *mod, *mod2, *mod_loaded, *prev_active;
 	size_t len;
 	int error;
 	KASSERT(kernconfig_is_held());
 	/*
 	 * Search the list to see if we have a module by this name.
 	 */
 	TAILQ_FOREACH(mod, &module_builtins, mod_chain) {
 		if (strcmp(mod->mod_info->mi_name, name) == 0) {
 @@ -900,27 +900,27 @@ module_do_load(const char *name, bool is
+{
 #define MODULE_MAX_DEPTH 6
 	TAILQ_HEAD(pending_t, module);
 	static int depth = 0;
 	static struct pending_t *pending_lists[MODULE_MAX_DEPTH];
 	struct pending_t *pending;
 	struct pending_t new_pending = TAILQ_HEAD_INITIALIZER(new_pending);
 	modinfo_t *mi;
 	module_t *mod, *mod2, *prev_active;
 	prop_dictionary_t filedict;
 	char buf[MAXMODNAME];
 	const char *s, *p;
-	const char * const aliasp[];
+	const char * const *aliasp;
 	int error;
 	size_t len;
 	KASSERT(kernconfig_is_held());
 	filedict = NULL;
 	error = 0;
 	/*
 	 * Avoid recursing too far.
 	 */
 	if (++depth > MODULE_MAX_DEPTH) {
 		module_error("recursion too deep for `%s' %d > %d", name,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $	*/
+/*	$NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * CONSEQUENTIAL 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.
  */
 /*
  * System calls relating to loadable modules.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/kobj.h>
 #include <sys/module.h>
 @@ -112,27 +112,27 @@ out1:
 static int
 handle_modctl_stat(struct iovec *iov, void *arg)
+{
 	modstat_t *ms, *mso;
 	modinfo_t *mi;
 	module_t *mod;
 	vaddr_t addr;
 	size_t size;
 	size_t mslen;
 	int error;
 	int mscnt;
 	bool stataddr;
-	const char * const aliasp[];
+	const char * const *aliasp;
 	/* If not privileged, don't expose kernel addresses. */
 	error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,
 , (void *)(uintptr_t)MODCTL_STAT, NULL, NULL);
 	stataddr = (error == 0);
 	kernconfig_lock();
 	mscnt = 0;
 	TAILQ_FOREACH(mod, &module_list, mod_chain) {
 		mscnt++;
 		mi = mod->mod_info;
 		if ((aliasp = *mi->mi_aliases) != NULL) {
 			while (*aliasp++ != NULL)