 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_module.c,v 1.44 2009/05/25 22:33:00 jnemeth Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.45 2009/05/26 08:34:23 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.44 2009/05/25 22:33:00 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.45 2009/05/26 08:34:23 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>
 @@ -553,26 +553,27 @@ static int
 module_do_load(const char *name, bool isdep, int flags,
 	       prop_dictionary_t props, module_t **modp, modclass_t class,
 	       bool autoload)
+{
 	static TAILQ_HEAD(,module) pending = TAILQ_HEAD_INITIALIZER(pending);
 	static int depth;
 	const int maxdepth = 6;
 	modinfo_t *mi;
 	module_t *mod, *mod2;
 	char buf[MAXMODNAME], *path;
 	const char *s, *p;
 	int error;
 	size_t len;
 	bool nochroot;
 	KASSERT(mutex_owned(&module_lock));
 	error = 0;
 	path=NULL;
 	/*
 	 * Avoid recursing too far.
 	 */
 	if (++depth > maxdepth) {
 		module_error("too many required modules");
 		depth--;
 		return EMLINK;
 @@ -610,34 +611,35 @@ module_do_load(const char *name, bool is
+				}
 				depth--;
 				return 0;
+			}
+		}
 		mod = kmem_zalloc(sizeof(*mod), KM_SLEEP);
 		if (mod == NULL) {
 			module_error("out of memory for `%s'", name);
 			depth--;
 			return ENOMEM;
+		}
 		path = PNBUF_GET();
 		if (!autoload) {
 			nochroot = false;
 			snprintf(path, MAXPATHLEN, "%s", name);
-			error = kobj_load_file(&mod->mod_kobj, path, FOLLOW);
+			error = kobj_load_file(&mod->mod_kobj, path, nochroot);
+		}
 		if (autoload || (error == ENOENT)) {
 			nochroot = true;
 			snprintf(path, MAXPATHLEN, "%s/%s/%s.kmod",
 			    module_base, name, name);
-			error = kobj_load_file(&mod->mod_kobj, path,
+			error = kobj_load_file(&mod->mod_kobj, path, nochroot);
 			    FOLLOW | NOCHROOT);
+		}
 		if (error != 0) {
 			kmem_free(mod, sizeof(*mod));
 			depth--;
 			PNBUF_PUT(path);
 			if (autoload) {
 				module_print("Cannot load kernel object `%s'"
 				    " error=%d", name, error);
 			} else {
 				module_error("Cannot load kernel object `%s'"
 				    " error=%d", name, error);
+			}
 			return error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_kobj.c,v 1.37 2009/05/25 22:33:00 jnemeth Exp $	*/
+/*	$NetBSD: subr_kobj.c,v 1.38 2009/05/26 08:34:23 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.
 @@ -53,27 +53,27 @@
  * 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 loader for ELF objects.
+ *
  * TODO: adjust kmem_alloc() calls to avoid needless fragmentation.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.37 2009/05/25 22:33:00 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.38 2009/05/26 08:34:23 jnemeth Exp $");
 #include "opt_modular.h"
 #include <sys/kobj_impl.h>
 #ifdef MODULAR
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 @@ -93,41 +93,42 @@ static int	kobj_read_bits(kobj_t, void *
 static void	kobj_jettison(kobj_t);
 static void	kobj_free(kobj_t, void *, size_t);
 static void	kobj_close(kobj_t);
 static int	kobj_load(kobj_t);
 extern struct vm_map *module_map;
 /*
  * kobj_load_file:
+ *
  *	Load an object located in the file system.
  */
 int
-kobj_load_file(kobj_t *kop, const char *path, const uint32_t flags)
+kobj_load_file(kobj_t *kop, const char *path, const bool nochroot)
+{
 	struct nameidata nd;
 	kauth_cred_t cred;
 	int error;
 	kobj_t ko;
 	cred = kauth_cred_get();
 	ko = kmem_zalloc(sizeof(*ko), KM_SLEEP);
 	if (ko == NULL) {
 		return ENOMEM;
+	}
-	NDINIT(&nd, LOOKUP, flags, UIO_SYSSPACE, path);
+	NDINIT(&nd, LOOKUP, FOLLOW | (nochroot ? NOCHROOT : 0),
 	    UIO_SYSSPACE, path);
 	error = vn_open(&nd, FREAD, 0);
  	if (error != 0) {
 	 	kmem_free(ko, sizeof(*ko));
 	 	return error;
+	}
 	ko->ko_type = KT_VNODE;
 	ko->ko_source = nd.ni_vp;
 	*kop = ko;
 	return kobj_load(ko);
+}
 @@ -1095,27 +1096,27 @@ kobj_read_bits(kobj_t ko, void *base, si
  *	Utility function: free memory if it was allocated from the heap.
  */
 static void
 kobj_free(kobj_t ko, void *base, size_t size)
+{
 	if (ko->ko_type != KT_MEMORY)
 		kmem_free(base, size);
+}
 #else	/* MODULAR */
 int
-kobj_load_file(kobj_t *kop, const char *name, const uint32_t flags)
+kobj_load_file(kobj_t *kop, const char *name, const bool nochroot)
+{
 	return ENOSYS;
+}
 int
 kobj_load_mem(kobj_t *kop, void *base, ssize_t size)
+{
 	return ENOSYS;
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kobj.h,v 1.10 2009/05/25 22:33:00 jnemeth Exp $	*/
+/*	$NetBSD: kobj.h,v 1.11 2009/05/26 08:34:22 jnemeth 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.
 @@ -22,26 +22,26 @@
  * 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.
  */
 #ifndef _SYS_KOBJ_H_
 #define	_SYS_KOBJ_H_
 typedef struct kobj *kobj_t;
 /* External interface. */
-int		kobj_load_file(kobj_t *, const char *, const uint32_t);
+int		kobj_load_file(kobj_t *, const char *, const bool);
 int		kobj_load_mem(kobj_t *, void *, ssize_t);
 int		kobj_affix(kobj_t, const char *);
 void		kobj_unload(kobj_t);
 void		kobj_stat(kobj_t, vaddr_t *, size_t *);
 int		kobj_find_section(kobj_t, const char *, void **, size_t *);
 /* MI-MD interface. */
 uintptr_t	kobj_sym_lookup(kobj_t, uintptr_t);
 int		kobj_reloc(kobj_t, uintptr_t, const void *, bool, bool);
 int		kobj_machdep(kobj_t, void *, size_t, bool);
 #endif /* !_SYS_KOBJ_H_ */