 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_module.c,v 1.46 2009/06/07 09:47:31 jnemeth Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.47 2009/06/09 19:09:03 jnemeth 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.46 2009/06/07 09:47:31 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.47 2009/06/09 19:09:03 jnemeth Exp $");
 #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/fcntl.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 #include <sys/kobj.h>
 @@ -85,26 +85,27 @@ __link_set_add_rodata(modules, module_du
 static module_t	*module_lookup(const char *);
 static int	module_do_load(const char *, bool, int, prop_dictionary_t,
 		    module_t **, modclass_t class, bool);
 static int	module_do_unload(const char *);
 static void	module_error(const char *, ...)
 			__attribute__((__format__(__printf__,1,2)));
 static void	module_print(const char *, ...)
 			__attribute__((__format__(__printf__,1,2)));
 static int	module_do_builtin(const char *, module_t **);
 static int	module_fetch_info(module_t *);
 static void	module_thread(void *);
 static int	module_load_plist_file(const char *, const bool, void **,
 		    size_t *);
 static bool	module_merge_dicts(prop_dictionary_t, const prop_dictionary_t);
 /*
  * module_error:
+ *
  *	Utility function: log an error.
  */
 static void
 module_error(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	printf("WARNING: module error: ");
 @@ -787,40 +788,44 @@ module_do_load(const char *name, bool is
 	/*
 	 * Load and process <module>.prop if it exists.
 	 */
 	if (mod->mod_source == MODULE_SOURCE_FILESYS) {
 		error = module_load_plist_file(path, nochroot, &plist,
 		    &plistlen);
 		if (error != 0) {
 			module_print("plist load returned error %d for `%s'",
 			    error, path);
 		} else {
 			filedict = prop_dictionary_internalize(plist);
 			if (filedict == NULL) {
 				error = EINVAL;
 			} else if (!module_merge_dicts(filedict, props)) {
 				error = EINVAL;
 				prop_object_release(filedict);
 				filedict = NULL;
+			}
+		}
 		if (plist != NULL) {
 			kmem_free(plist, PAGE_SIZE);
+		}
 		if ((error != 0) && (error != ENOENT)) {
 			goto fail;
+		}
+	}
 	KASSERT(module_active == NULL);
 	module_active = mod;
 	error = (*mi->mi_modcmd)(MODULE_CMD_INIT, (filedict != NULL) ?
-	    filedict : props);
+	    filedict : props);	/* props will have been merged with filedict */
 	module_active = NULL;
 	if (filedict != NULL) {
 		prop_object_release(filedict);
+	}
 	if (error != 0) {
 		module_error("modcmd function returned error %d for `%s'",
 		    error, mi->mi_name);
 		goto fail;
+	}
 	/*
 	 * Good, the module loaded successfully.  Put it onto the
 	 * list and add references to its requisite modules.
 @@ -1187,13 +1192,47 @@ module_load_plist_file(const char *modpa
 		base = NULL;
+	}
 	*length = sb.st_size;
 out:
 	VOP_UNLOCK(nd.ni_vp, 0);
 	vn_close(nd.ni_vp, FREAD, kauth_cred_get());
 out1:
 	PNBUF_PUT(proppath);
 	*basep = base;
 	return error;
+}
 static bool
 module_merge_dicts(prop_dictionary_t existing_dict,
 		   const prop_dictionary_t new_dict)
+{
 	prop_dictionary_keysym_t props_keysym;
 	prop_object_iterator_t props_iter;
 	prop_object_t props_obj;
 	const char *props_key;
 	bool error;
 	error = false;
 	props_iter = prop_dictionary_iterator(new_dict);
 	if (props_iter == NULL) {
 		return false;
+	}
 	while ((props_obj = prop_object_iterator_next(props_iter)) != NULL) {
 		props_keysym = (prop_dictionary_keysym_t)props_obj;
 		props_key = prop_dictionary_keysym_cstring_nocopy(props_keysym);
 		props_obj = prop_dictionary_get_keysym(new_dict, props_keysym);
 		if ((props_obj == NULL) || !prop_dictionary_set(existing_dict,
 		    props_key, props_obj)) {
 			error = true;
 			goto out;
+		}
+	}
 	error = false;
 out:
 	prop_object_iterator_release(props_iter);
 	return !error;
+}