Fri Dec 24 12:41:44 2010 UTC ()

Add support for DF_1_BIND_NOW, DF_1_NODELETE and DF_1_NOOPEN marked
objects, and the RTLD_NODELETE and RTLD_NOLOAD flags to dlopen(3).

Mark libpthread as DF_1_NOOPEN and use it to test the functionality.

Somewhat taken from FreeBSD.

Fixes PR 42029.

OK from christos and joerg.


(skrll)

diff -r1.187 -r1.188 src/distrib/sets/lists/tests/mi
diff -r1.21 -r1.22 src/include/dlfcn.h
diff -r1.70 -r1.71 src/lib/libpthread/Makefile
diff -r1.37 -r1.38 src/libexec/ld.elf_so/headers.c
diff -r1.41 -r1.42 src/libexec/ld.elf_so/load.c
diff -r1.102 -r1.103 src/libexec/ld.elf_so/reloc.c
diff -r1.136 -r1.137 src/libexec/ld.elf_so/rtld.c
diff -r1.96 -r1.97 src/libexec/ld.elf_so/rtld.h
diff -r1.22 -r1.23 src/libexec/ld.elf_so/search.c
diff -r1.27 -r1.28 src/share/man/man3/dlfcn.3
diff -r1.107 -r1.108 src/sys/sys/exec_elf.h
diff -r1.2 -r1.3 src/tests/libexec/ld.elf_so/Makefile
diff -r0 -r1.1 src/tests/libexec/ld.elf_so/h_df_1_noopen.c
diff -r0 -r1.1 src/tests/libexec/ld.elf_so/t_df_1_noopen.sh

--- src/distrib/sets/lists/tests/mi 2010/12/23 15:27:44	1.187
+++ src/distrib/sets/lists/tests/mi 2010/12/24 12:41:42	1.188

 @@ -1,14 +1,14 @@
-# $NetBSD: mi,v 1.187 2010/12/23 15:27:44 pgoyette Exp $
+# $NetBSD: mi,v 1.188 2010/12/24 12:41:42 skrll Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 ./etc/mtree/set.tests				tests-sys-root
 ./usr/libdata/debug/usr/tests						tests-base-debug
 ./usr/libdata/debug/usr/tests/atf					tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-c					tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-c/atf_c_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/build_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/check_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/config_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/detail				tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-c/detail/dynstr_test.debug	tests-atf-debug		debug,atf
 @@ -377,26 +377,28 @@
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_siglongjmp.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_sleep.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_status.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/librt					tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/librt/t_sem.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libskey				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libskey/t_algorithms.debug		tests-lib-debug		debug,atf,skey
 ./usr/libdata/debug/usr/tests/lib/libutil				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libutil/t_parsedate.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_snprintb.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_sockaddr_snprintf.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/libexec					tests-lib-debug
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so				tests-libexec-debug
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen1.debug	tests-libexec-debug	debug,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen2.debug	tests-libexec-debug	debug,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-cleared.debug	tests-libexec-debug	debug,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-false.debug	tests-libexec-debug	debug,atf
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlinfo.debug		tests-libexec-debug	debug,atf
 ./usr/libdata/debug/usr/tests/modules					tests-sys-debug
 ./usr/libdata/debug/usr/tests/modules/t_builtin.debug			tests-sys-debug		debug,atf
 ./usr/libdata/debug/usr/tests/modules/t_modctl.debug			tests-sys-debug		debug,atf
 ./usr/libdata/debug/usr/tests/net					tests-net-debug
 ./usr/libdata/debug/usr/tests/net/bpf					tests-net-debug
 ./usr/libdata/debug/usr/tests/net/bpf/t_bpf.debug		tests-net-debug		debug,atf
 ./usr/libdata/debug/usr/tests/net/bpf/t_div-by-zero.debug		tests-net-debug		debug,atf
 ./usr/libdata/debug/usr/tests/net/carp					tests-net-debug
 ./usr/libdata/debug/usr/tests/net/carp/t_basic.debug		tests-net-debug		debug,atf
 ./usr/libdata/debug/usr/tests/net/icmp					tests-net-debug
 @@ -1622,26 +1624,29 @@
 ./usr/tests/lib/librt/t_sem			tests-lib-tests		atf
 ./usr/tests/lib/libskey				tests-lib-tests		atf
 ./usr/tests/lib/libskey/Atffile			tests-lib-tests		atf,skey
 ./usr/tests/lib/libskey/t_algorithms		tests-lib-tests		atf,skey
 ./usr/tests/lib/libutil				tests-lib-tests		atf
 ./usr/tests/lib/libutil/Atffile			tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_parsedate		tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_snprintb		tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_sockaddr_snprintf	tests-lib-tests		atf
 ./usr/tests/libexec				tests-lib-tests
 ./usr/tests/libexec/Atffile			tests-lib-tests		atf
 ./usr/tests/libexec/ld.elf_so			tests-libexec-tests
 ./usr/tests/libexec/ld.elf_so/Atffile		tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/h_df_1_noopen1	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/h_df_1_noopen2	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/t_df_1_noopen	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/t_dlerror-cleared	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/t_dlerror-false	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/t_dlinfo		tests-libexec-tests	atf
 ./usr/tests/modules				tests-sys-tests
 ./usr/tests/net					tests-net-tests
 ./usr/tests/net/Atffile				tests-net-tests		atf
 ./usr/tests/net/bpf				tests-net-tests
 ./usr/tests/net/bpf/Atffile			tests-net-tests		atf
 ./usr/tests/net/bpf/t_bpf		tests-net-tests		atf
 ./usr/tests/net/bpf/t_div-by-zero		tests-net-tests		atf
 ./usr/tests/net/carp				tests-net-tests
 ./usr/tests/net/carp/Atffile			tests-net-tests		atf
 ./usr/tests/net/carp/t_basic		tests-net-tests		atf

--- src/include/dlfcn.h 2010/01/07 07:35:35	1.21
+++ src/include/dlfcn.h 2010/12/24 12:41:42	1.22

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dlfcn.h,v 1.21 2010/01/07 07:35:35 skrll Exp $	*/
+/*	$NetBSD: dlfcn.h,v 1.22 2010/12/24 12:41:42 skrll Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -54,26 +54,28 @@ void	*dlsym(void * __restrict, const cha
 #if defined(_NETBSD_SOURCE)
 int	dladdr(const void * __restrict, Dl_info * __restrict);
 int	dlctl(void *, int, void *);
 int	dlinfo(void *, int, void *);
 #endif
 __aconst char *dlerror(void);
 __END_DECLS
 /* Values for dlopen `mode'. */
 #define RTLD_LAZY	1
 #define RTLD_NOW	2
 #define RTLD_GLOBAL	0x100		/* Allow global searches in object */
 #define RTLD_LOCAL	0x200
 #define RTLD_NODELETE	0x01000		/* Do not remove members. */
 #define RTLD_NOLOAD	0x02000		/* Do not load if not already loaded. */
 #if defined(_NETBSD_SOURCE)
 #define DL_LAZY		RTLD_LAZY	/* Compat */
 #endif
 /*
  * Special handle arguments for dlsym().
  */
 #define	RTLD_NEXT	((void *) -1)	/* Search subsequent objects. */
 #define	RTLD_DEFAULT	((void *) -2)	/* Use default search algorithm. */
 #define	RTLD_SELF	((void *) -3)	/* Search the caller itself. */
 /*
  * dlctl() commands

--- src/lib/libpthread/Makefile 2010/08/06 05:35:42	1.70
+++ src/lib/libpthread/Makefile 2010/12/24 12:41:42	1.71

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.70 2010/08/06 05:35:42 christos Exp $
+#	$NetBSD: Makefile,v 1.71 2010/12/24 12:41:42 skrll Exp $
+#
 WARNS=	4
 .include <bsd.own.mk>
 .if defined(PTHREAD_MACHINE_ARCH) && !empty(PTHREAD_MACHINE_ARCH) && \
     exists(${.CURDIR}/arch/${PTHREAD_MACHINE_ARCH})
 ARCHSUBDIR=	${PTHREAD_MACHINE_ARCH}
 .elif exists(${.CURDIR}/arch/${MACHINE_ARCH})
 ARCHSUBDIR=	${MACHINE_ARCH}
 .elif exists(${.CURDIR}/arch/${MACHINE_CPU})
 ARCHSUBDIR=	${MACHINE_CPU}
 @@ -23,26 +23,28 @@ INCSDIR=/usr/include
 .if defined(ARCHSUBDIR)
 ARCHDIR=	${.CURDIR}/arch/${ARCHSUBDIR}
 .PATH:	${ARCHDIR}
 CPPFLAGS+=	-I${ARCHDIR} -I${.CURDIR} -I${.OBJDIR} -D_LIBC
 CPPFLAGS+=	-D__LIBPTHREAD_SOURCE__
 # XXX: This crappy poke at libc's internals needs to be fixed.
 CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${.CURDIR}/../libc
 LIB=	pthread
 LDFLAGS+=	-Wl,-znodlopen
+#
 # NOTE: When you create a new file for libpthread, make sure that pthread.c
 # gets a reference to a symbol in that file.  Otherwise, Unix's stupid static
 # library semantics will end up discarding potentially important objects.
+#
 SRCS=	pthread.c
 SRCS+=	pthread_attr.c
 SRCS+=	pthread_barrier.c
 SRCS+=	pthread_cancelstub.c
 SRCS+=	pthread_cond.c
 SRCS+=	pthread_lock.c
 SRCS+=	pthread_misc.c
 SRCS+=	pthread_mutex.c

--- src/libexec/ld.elf_so/headers.c 2010/10/16 17:48:12	1.37
+++ src/libexec/ld.elf_so/headers.c 2010/12/24 12:41:43	1.38

 @@ -1,14 +1,14 @@
-/*	$NetBSD: headers.c,v 1.37 2010/10/16 17:48:12 skrll Exp $	 */
+/*	$NetBSD: headers.c,v 1.38 2010/12/24 12:41:43 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.37 2010/10/16 17:48:12 skrll Exp $");
+__RCSID("$NetBSD: headers.c,v 1.38 2010/12/24 12:41:43 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/bitops.h>
 @@ -232,28 +232,34 @@ _rtld_digest_dynamic(const char *execnam
 		case DT_MIPS_GOTSYM:
 			obj->gotsym = dynp->d_un.d_val;
 			break;
 		case DT_MIPS_RLD_MAP:
 #ifdef RTLD_LOADER
 			*((Elf_Addr *)(dynp->d_un.d_ptr)) = (Elf_Addr)
 			    &_rtld_debug;
 #endif
 			break;
 #endif
 		case DT_FLAGS_1:
-			obj->initfirst =
+			obj->z_now =
 			    ((dynp->d_un.d_val & DF_1_BIND_NOW) != 0);
 			obj->z_nodelete =
 			    ((dynp->d_un.d_val & DF_1_NODELETE) != 0);
 			obj->z_initfirst =
 			    ((dynp->d_un.d_val & DF_1_INITFIRST) != 0);
 			obj->z_noopen =
 			    ((dynp->d_un.d_val & DF_1_NOOPEN) != 0);
 			break;
+		}
+	}
 	obj->rellim = (const Elf_Rel *)((const uint8_t *)obj->rel + relsz);
 	obj->relalim = (const Elf_Rela *)((const uint8_t *)obj->rela + relasz);
 	if (use_pltrel) {
 		obj->pltrel = (const Elf_Rel *)(obj->relocbase + pltrel);
 		obj->pltrellim = (const Elf_Rel *)(obj->relocbase + pltrel + pltrelsz);
 		obj->pltrelalim = 0;
 		/* On PPC and SPARC, at least, REL(A)SZ may include JMPREL.
 		   Trim rel(a)lim to save time later. */
 		if (obj->rellim && obj->pltrel &&

--- src/libexec/ld.elf_so/load.c 2010/12/19 17:26:51	1.41
+++ src/libexec/ld.elf_so/load.c 2010/12/24 12:41:43	1.42

 @@ -1,14 +1,14 @@
-/*	$NetBSD: load.c,v 1.41 2010/12/19 17:26:51 skrll Exp $	 */
+/*	$NetBSD: load.c,v 1.42 2010/12/24 12:41:43 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: load.c,v 1.41 2010/12/19 17:26:51 skrll Exp $");
+__RCSID("$NetBSD: load.c,v 1.42 2010/12/24 12:41:43 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 @@ -99,27 +99,27 @@ _rtld_objlist_find(Objlist *list, const
 			return elm;
+	}
 	return NULL;
+}
 #endif
 /*
  * Load a shared object into memory, if it is not already loaded.
+ *
  * Returns a pointer to the Obj_Entry for the object.  Returns NULL
  * on failure.
  */
 Obj_Entry *
-_rtld_load_object(const char *filepath, int mode)
+_rtld_load_object(const char *filepath, int flags)
+{
 	Obj_Entry *obj;
 	int fd = -1;
 	struct stat sb;
 	size_t pathlen = strlen(filepath);
 	for (obj = _rtld_objlist->next; obj != NULL; obj = obj->next)
 		if (pathlen == obj->pathlen && !strcmp(obj->path, filepath))
 			break;
 	/*
 	 * If we didn't find a match by pathname, open the file and check
 	 * again by device and inode.  This avoids false mismatches caused
 @@ -143,57 +143,70 @@ _rtld_load_object(const char *filepath,
 				close(fd);
 				break;
+			}
+		}
+	}
 	if (obj == NULL) { /* First use of this object, so we must map it in */
 		obj = _rtld_map_object(filepath, fd, &sb);
 		(void)close(fd);
 		if (obj == NULL)
 			return NULL;
 		_rtld_digest_dynamic(filepath, obj);
 		if (flags & _RTLD_DLOPEN) {
 			if (obj->z_noopen || (flags & _RTLD_NOLOAD)) {
 				dbg(("refusing to load non-loadable \"%s\"",
 				    obj->path));
 				_rtld_error("Cannot dlopen non-loadable %s",
 				    obj->path);
 				munmap(obj->mapbase, obj->mapsize);
 				_rtld_obj_free(obj);
 				return OBJ_ERR;
+			}
+		}
 		*_rtld_objtail = obj;
 		_rtld_objtail = &obj->next;
 		_rtld_objcount++;
 		_rtld_objloads++;
 #ifdef RTLD_LOADER
 		_rtld_linkmap_add(obj);	/* for GDB */
 #endif
 		dbg(("  %p .. %p: %s", obj->mapbase,
 		    obj->mapbase + obj->mapsize - 1, obj->path));
 		if (obj->textrel)
 			dbg(("  WARNING: %s has impure text", obj->path));
+	}
 	++obj->refcount;
 #ifdef RTLD_LOADER
-	if (mode & RTLD_MAIN && !obj->mainref) {
+	if (flags & _RTLD_MAIN && !obj->mainref) {
 		obj->mainref = 1;
 		dbg(("adding %p (%s) to _rtld_list_main", obj, obj->path));
 		_rtld_objlist_push_tail(&_rtld_list_main, obj);
+	}
-	if (mode & RTLD_GLOBAL && !obj->globalref) {
+	if (flags & _RTLD_GLOBAL && !obj->globalref) {
 		obj->globalref = 1;
 		dbg(("adding %p (%s) to _rtld_list_global", obj, obj->path));
 		_rtld_objlist_push_tail(&_rtld_list_global, obj);
+	}
 #endif
 	return obj;
+}
 static bool
-_rtld_load_by_name(const char *name, Obj_Entry *obj, Needed_Entry **needed, int mode)
+_rtld_load_by_name(const char *name, Obj_Entry *obj, Needed_Entry **needed,
     int flags)
+{
 	Library_Xform *x = _rtld_xforms;
 	Obj_Entry *o = NULL;
 	size_t j;
 	ssize_t i;
 	bool got = false;
 	union {
 		int i;
 		u_quad_t q;
 		char s[16];
 	} val;
 	dbg(("load by name %s %p", name, x));
 @@ -230,94 +243,108 @@ _rtld_load_by_name(const char *name, Obj
 			if (strcmp(x->entry[i].value, val.s) == 0)
 				break;
+		}
 		if (i == RTLD_MAX_ENTRY) {
 			xwarnx("sysctl value %s not found for lib%s",
 			    val.s, name);
 			break;
+		}
 		for (j = 0; j < RTLD_MAX_LIBRARY &&
 		    x->entry[i].library[j] != NULL; j++) {
 			o = _rtld_load_library(x->entry[i].library[j], obj,
-			    mode);
+			    flags);
 			if (o == NULL) {
 				xwarnx("could not load %s for %s",
 				    x->entry[i].library[j], name);
 				continue;
+			}
 			got = true;
 			if (j == 0)
 				(*needed)->obj = o;
 			else {
 				/* make a new one and put it in the chain */
 				Needed_Entry *ne = xmalloc(sizeof(*ne));
 				ne->name = (*needed)->name;
 				ne->obj = o;
 				ne->next = (*needed)->next;
 				(*needed)->next = ne;
 				*needed = ne;
+			}
+		}
+	}
 	if (got)
 		return true;
-	return ((*needed)->obj = _rtld_load_library(name, obj, mode)) != NULL;
+	return ((*needed)->obj = _rtld_load_library(name, obj, flags)) != NULL;
+}
 /*
  * Given a shared object, traverse its list of needed objects, and load
  * each of them.  Returns 0 on success.  Generates an error message and
  * returns -1 on failure.
  */
 int
-_rtld_load_needed_objects(Obj_Entry *first, int mode)
+_rtld_load_needed_objects(Obj_Entry *first, int flags)
+{
 	Obj_Entry *obj;
 	int status = 0;
 	for (obj = first; obj != NULL; obj = obj->next) {
 		Needed_Entry *needed;
 		for (needed = obj->needed; needed != NULL;
 		    needed = needed->next) {
 			const char *name = obj->strtab + needed->name;
-			if (!_rtld_load_by_name(name, obj, &needed, mode))
+#ifdef RTLD_LOADER
 			Obj_Entry *nobj;
 #endif
 			if (!_rtld_load_by_name(name, obj, &needed,
 			    flags & ~_RTLD_NOLOAD))
 				status = -1;	/* FIXME - cleanup */
 #ifdef RTLD_LOADER
 			if (status == -1)
 				return status;
 			if (flags & _RTLD_MAIN)
 				continue;
 			nobj = needed->obj;
 			if (nobj->z_nodelete && !obj->ref_nodel) {
 				dbg(("obj %s nodelete", nobj->path));
 				_rtld_ref_dag(nobj);
 				nobj->ref_nodel = true;
+			}
 #endif
+		}
+	}
 	return status;
+}
 #ifdef RTLD_LOADER
 int
 _rtld_preload(const char *preload_path)
+{
 	const char *path;
 	char *cp, *buf;
 	int status = 0;
 	if (preload_path != NULL && *preload_path != '\0') {
 		cp = buf = xstrdup(preload_path);
 		while ((path = strsep(&cp, " :")) != NULL && status == 0) {
-			if (!_rtld_load_object(path, RTLD_MAIN))
+			if (!_rtld_load_object(path, _RTLD_MAIN))
 				status = -1;
 			else
 				dbg((" preloaded \"%s\"", path));
+		}
 		xfree(buf);
+	}
 	return status;
+}
 #endif

--- src/libexec/ld.elf_so/reloc.c 2010/04/05 14:01:26	1.102
+++ src/libexec/ld.elf_so/reloc.c 2010/12/24 12:41:43	1.103

 @@ -1,14 +1,14 @@
-/*	$NetBSD: reloc.c,v 1.102 2010/04/05 14:01:26 joerg Exp $	 */
+/*	$NetBSD: reloc.c,v 1.103 2010/12/24 12:41:43 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * 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
 @@ -29,27 +29,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.102 2010/04/05 14:01:26 joerg Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.103 2010/12/24 12:41:43 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/bitops.h>
 @@ -185,27 +185,27 @@ _rtld_relocate_objects(Obj_Entry *first,
 			if (mprotect(obj->mapbase, obj->textsize,
 				     PROT_READ | PROT_EXEC) == -1) {
 				_rtld_error("%s: Cannot write-protect text "
 				    "segment: %s", obj->path, xstrerror(errno));
 				return -1;
+			}
+		}
 		dbg(("doing lazy PLT binding"));
 		if (_rtld_relocate_plt_lazy(obj) < 0)
 			ok = 0;
 #if defined(__hppa__)
 		bind_now = 1;
 #endif
-		if (bind_now) {
+		if (obj->z_now || bind_now) {
 			dbg(("doing immediate PLT binding"));
 			if (_rtld_relocate_plt_objects(obj) < 0)
 				ok = 0;
+		}
 		if (!ok)
 			return -1;
 		/* Set some sanity-checking numbers in the Obj_Entry. */
 		obj->magic = RTLD_MAGIC;
 		obj->version = RTLD_VERSION;
 		/* Fill in the dynamic linker entry points. */
 		obj->dlopen = dlopen;

--- src/libexec/ld.elf_so/rtld.c 2010/12/19 17:26:51	1.136
+++ src/libexec/ld.elf_so/rtld.c 2010/12/24 12:41:43	1.137

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.136 2010/12/19 17:26:51 skrll Exp $	 */
+/*	$NetBSD: rtld.c,v 1.137 2010/12/24 12:41:43 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.136 2010/12/19 17:26:51 skrll Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.137 2010/12/24 12:41:43 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <dirent.h>
 @@ -137,27 +137,27 @@ _rtld_call_fini_functions(int force)
 	Obj_Entry *obj;
 	dbg(("_rtld_call_fini_functions(%d)", force));
 	SIMPLEQ_INIT(&finilist);
 	_rtld_initlist_tsort(&finilist, 1);
 	/* First pass: objects _not_ marked with DF_1_INITFIRST. */
 	SIMPLEQ_FOREACH(elm, &finilist, link) {
 		obj = elm->obj;
 		if (obj->refcount > 0 && !force) {
 			continue;
+		}
-		if (obj->fini == NULL || obj->fini_called || obj->initfirst) {
+		if (obj->fini == NULL || obj->fini_called || obj->z_initfirst) {
 		    	continue;
+		}
 		dbg (("calling fini function %s at %p",  obj->path,
 		    (void *)obj->fini));
 		obj->fini_called = 1;
 		(*obj->fini)();
+	}
 	/* Second pass: objects marked with DF_1_INITFIRST. */
 	SIMPLEQ_FOREACH(elm, &finilist, link) {
 		obj = elm->obj;
 		if (obj->refcount > 0 && !force) {
 			continue;
 @@ -178,27 +178,27 @@ static void
 _rtld_call_init_functions()
+{
 	Objlist_Entry *elm;
 	Objlist initlist;
 	Obj_Entry *obj;
 	dbg(("_rtld_call_init_functions()"));
 	SIMPLEQ_INIT(&initlist);
 	_rtld_initlist_tsort(&initlist, 0);
 	/* First pass: objects marked with DF_1_INITFIRST. */
 	SIMPLEQ_FOREACH(elm, &initlist, link) {
 		obj = elm->obj;
-		if (obj->init == NULL || obj->init_called || !obj->initfirst) {
+		if (obj->init == NULL || obj->init_called || !obj->z_initfirst) {
 			continue;
+		}
 		dbg (("calling init function %s at %p (DF_1_INITFIRST)",
 		    obj->path, (void *)obj->init));
 		obj->init_called = 1;
 		(*obj->init)();
+	}
 	/* Second pass: all other objects. */
 	SIMPLEQ_FOREACH(elm, &initlist, link) {
 		obj = elm->obj;
 		if (obj->init == NULL || obj->init_called) {
 			continue;
 @@ -558,27 +558,27 @@ _rtld(Elf_Addr *sp, Elf_Addr relocbase)
 	_rtld_objlist_push_tail(&_rtld_list_main, _rtld_objmain);
 	if (ld_preload) {
 		/*
 		 * Pre-load user-specified objects after the main program
 		 * but before any shared object dependencies.
 		 */
 		dbg(("preloading objects"));
 		if (_rtld_preload(ld_preload) == -1)
 			_rtld_die();
+	}
 	dbg(("loading needed objects"));
-	if (_rtld_load_needed_objects(_rtld_objmain, RTLD_MAIN) == -1)
+	if (_rtld_load_needed_objects(_rtld_objmain, _RTLD_MAIN) == -1)
 		_rtld_die();
 	dbg(("relocating objects"));
 	if (_rtld_relocate_objects(_rtld_objmain, bind_now) == -1)
 		_rtld_die();
 	dbg(("doing copy relocations"));
 	if (_rtld_do_copy_relocations(_rtld_objmain) == -1)
 		_rtld_die();
 	/*
 	 * Set the __progname,  environ and, __mainprog_obj before
 	 * calling anything that might use them.
 @@ -750,33 +750,55 @@ _rtld_unload_object(Obj_Entry *root, boo
 				munmap(obj->mapbase, obj->mapsize);
 				_rtld_objlist_remove(&_rtld_list_global, obj);
 				_rtld_linkmap_delete(obj);
 				*linkp = obj->next;
 				_rtld_objcount--;
 				_rtld_obj_free(obj);
 			} else
 				linkp = &obj->next;
+		}
 		_rtld_objtail = linkp;
+	}
+}
 void
 _rtld_ref_dag(Obj_Entry *root)
+{
 	const Needed_Entry *needed;
 	assert(root);
 	++root->refcount;
 	dbg(("incremented reference on \"%s\" (%d)", root->path,
 	    root->refcount));
 	for (needed = root->needed; needed != NULL;
 	     needed = needed->next) {
 		if (needed->obj != NULL)
 			_rtld_ref_dag(needed->obj);
+	}
+}
 static void
 _rtld_unref_dag(Obj_Entry *root)
+{
 	assert(root);
 	assert(root->refcount != 0);
 	--root->refcount;
 	dbg(("decremented reference on \"%s\" (%d)", root->path,
 	    root->refcount));
 	if (root->refcount == 0) {
 		const Needed_Entry *needed;
 		for (needed = root->needed; needed != NULL;
 		     needed = needed->next) {
 			if (needed->obj != NULL)
 				_rtld_unref_dag(needed->obj);
+		}
+	}
+}
 __strong_alias(__dlclose,dlclose)
 int
 @@ -805,52 +827,69 @@ dlerror(void)
+{
 	char *msg = error_message;
 	error_message = NULL;
 	return msg;
+}
 __strong_alias(__dlopen,dlopen)
 void *
 dlopen(const char *name, int mode)
+{
 	Obj_Entry **old_obj_tail = _rtld_objtail;
 	Obj_Entry *obj = NULL;
 	int flags = _RTLD_DLOPEN;
 	bool nodelete;
 	bool now;
 	flags |= (mode & RTLD_GLOBAL) ? _RTLD_GLOBAL : 0;
 	flags |= (mode & RTLD_NOLOAD) ? _RTLD_NOLOAD : 0;
 	nodelete = (mode & RTLD_NODELETE) ? true : false;
 	now = ((mode & RTLD_MODEMASK) == RTLD_NOW) ? true : false;
 	_rtld_debug.r_state = RT_ADD;
 	_rtld_debug_state();
 	if (name == NULL) {
 		obj = _rtld_objmain;
 		obj->refcount++;
 	} else
-		obj = _rtld_load_library(name, _rtld_objmain, mode);
+		obj = _rtld_load_library(name, _rtld_objmain, flags);
 	if (obj != NULL) {
 		++obj->dl_refcount;
 		if (*old_obj_tail != NULL) {	/* We loaded something new. */
 			assert(*old_obj_tail == obj);
-			if (_rtld_load_needed_objects(obj, mode) == -1 ||
+			if (_rtld_load_needed_objects(obj, flags) == -1 ||
 			    (_rtld_init_dag(obj),
 			    _rtld_relocate_objects(obj,
-			    ((mode & 3) == RTLD_NOW))) == -1) {
+			    (now || obj->z_now))) == -1) {
 				_rtld_unload_object(obj, false);
 				obj->dl_refcount--;
 				obj = NULL;
 			} else {
 				_rtld_call_init_functions();
+			}
+		}
 		if (obj != NULL) {
 			if ((nodelete || obj->z_nodelete) && !obj->ref_nodel) {
 				dbg(("dlopen obj %s nodelete", obj->path));
 				_rtld_ref_dag(obj);
 				obj->z_nodelete = obj->ref_nodel = true;
+			}
+		}
+	}
 	_rtld_debug.r_state = RT_CONSISTENT;
 	_rtld_debug_state();
 	return obj;
+}
 /*
  * Find a symbol in the main program.
  */
 void *
 _rtld_objmain_sym(const char *name)
+{

--- src/libexec/ld.elf_so/rtld.h 2010/12/05 00:56:06	1.96
+++ src/libexec/ld.elf_so/rtld.h 2010/12/24 12:41:43	1.97

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.h,v 1.96 2010/12/05 00:56:06 joerg Exp $	 */
+/*	$NetBSD: rtld.h,v 1.97 2010/12/24 12:41:43 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * 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
 @@ -118,27 +118,26 @@ typedef struct _rtld_library_xform_t {
 /*
  * Shared object descriptor.
+ *
  * Items marked with "(%)" are dynamically allocated, and must be freed
  * when the structure is destroyed.
+ *
  * The layout of this structure needs to be preserved because pre-2.0 binaries
  * hard-coded the location of dlopen() and friends.
  */
 #define RTLD_MAGIC	0xd550b87a
 #define RTLD_VERSION	1
 #define	RTLD_MAIN	0x800
 typedef struct Struct_Obj_Entry {
 	Elf32_Word      magic;		/* Magic number (sanity check) */
 	Elf32_Word      version;	/* Version number of struct format */
 	struct Struct_Obj_Entry *next;
 	char           *path;		/* Pathname of underlying file (%) */
 	int             refcount;
 	int             dl_refcount;	/* Number of times loaded by dlopen */
 	/* These items are computed by map_object() or by digest_phdr(). */
 	caddr_t         mapbase;	/* Base address of mapped region */
 	size_t          mapsize;	/* Size of mapped region in bytes */
 @@ -192,30 +191,37 @@ typedef struct Struct_Obj_Entry {
 			textrel:1,	/* True if there are relocations to
 					 * text seg */
 			symbolic:1,	/* True if generated with
 					 * "-Bsymbolic" */
 			printed:1,	/* True if ldd has printed it */
 			isdynamic:1,	/* True if this is a pure PIC object */
 			mainref:1,	/* True if on _rtld_list_main */
 			globalref:1,	/* True if on _rtld_list_global */
 			init_done:1,	/* True if .init has been added */
 			init_called:1,	/* True if .init function has been
 					 * called */
 			fini_called:1,	/* True if .fini function has been
 					 * called */
-			initfirst:1,	/* True if object's .init/.fini take
+			z_now:1,	/* True if object's symbols should be
 					   bound immediately */
 			z_nodelete:1,	/* True if object should never be
 					   unloaded */
 			z_initfirst:1,	/* True if object's .init/.fini take
 					 * priority over others */
-			phdr_loaded:1;	/* Phdr is loaded and doesn't need to
+			z_noopen:1,	/* True if object should never be
 					   dlopen'ed */
 			phdr_loaded:1,	/* Phdr is loaded and doesn't need to
 					 * be freed. */
 			ref_nodel:1;	/* Refcount increased to prevent dlclose */
 	struct link_map linkmap;	/* for GDB */
 	/* These items are computed by map_object() or by digest_phdr(). */
 	const char     *interp;	/* Pathname of the interpreter, if any */
 	Objlist         dldags;	/* Object belongs to these dlopened DAGs (%) */
 	Objlist         dagmembers;	/* DAG has these members (%) */
 	dev_t           dev;		/* Object's filesystem's device */
 	ino_t           ino;		/* Object's inode number */
 	void		*ehdr;
 	uint32_t        nbuckets;	/* Number of buckets */
 @@ -241,63 +247,73 @@ extern Search_Path *_rtld_default_paths;
 extern Obj_Entry *_rtld_objlist;
 extern Obj_Entry **_rtld_objtail;
 extern u_int _rtld_objcount;
 extern u_int _rtld_objloads;
 extern Obj_Entry *_rtld_objmain;
 extern Obj_Entry _rtld_objself;
 extern Search_Path *_rtld_paths;
 extern Library_Xform *_rtld_xforms;
 extern bool _rtld_trust;
 extern Objlist _rtld_list_global;
 extern Objlist _rtld_list_main;
 extern Elf_Sym _rtld_sym_zero;
 #define	RTLD_MODEMASK 0x3
 /* Flags for _rtld_load_object() and friends. */
 #define	_RTLD_GLOBAL	0x01	/* Add object to global DAG. */
 #define	_RTLD_MAIN	0x02
 #define	_RTLD_NOLOAD	0x04	/* dlopen() specified RTLD_NOLOAD. */
 #define	_RTLD_DLOPEN	0x08	/* Load_object() called from dlopen(). */
 /* rtld.c */
 /* We export these symbols using _rtld_symbol_lookup and is_exported. */
 __dso_public char *dlerror(void);
 __dso_public void *dlopen(const char *, int);
 __dso_public void *dlsym(void *, const char *);
 __dso_public int dlclose(void *);
 __dso_public int dladdr(const void *, Dl_info *);
 __dso_public int dlinfo(void *, int, void *);
 __dso_public int dl_iterate_phdr(int (*)(struct dl_phdr_info *, size_t, void *),
     void *);
 /* These aren't exported */
 void _rtld_error(const char *, ...)
      __attribute__((__format__(__printf__,1,2)));
 void _rtld_die(void) __attribute__((__noreturn__));
 void *_rtld_objmain_sym(const char *);
 void _rtld_debug_state(void);
 void _rtld_linkmap_add(Obj_Entry *);
 void _rtld_linkmap_delete(Obj_Entry *);
 void _rtld_objlist_push_head(Objlist *, Obj_Entry *);
 void _rtld_objlist_push_tail(Objlist *, Obj_Entry *);
 Objlist_Entry *_rtld_objlist_find(Objlist *, const Obj_Entry *);
 void _rtld_ref_dag(Obj_Entry *);
 /* expand.c */
 size_t _rtld_expand_path(char *, size_t, const char *, const char *,\
     const char *);
 /* headers.c */
 void _rtld_digest_dynamic(const char *, Obj_Entry *);
 Obj_Entry *_rtld_digest_phdr(const Elf_Phdr *, int, caddr_t);
 /* load.c */
 Obj_Entry *_rtld_load_object(const char *, int);
 int _rtld_load_needed_objects(Obj_Entry *, int);
 int _rtld_preload(const char *);
 #define	OBJ_ERR	(Obj_Entry *)(-1)
 /* path.c */
 void _rtld_add_paths(const char *, Search_Path **, const char *);
 void _rtld_process_hints(const char *, Search_Path **, Library_Xform **,
     const char *);
 int _rtld_sysctl(const char *, void *, size_t *);
 /* reloc.c */
 int _rtld_do_copy_relocations(const Obj_Entry *);
 int _rtld_relocate_objects(Obj_Entry *, bool);
 int _rtld_relocate_nonplt_objects(Obj_Entry *);
 int _rtld_relocate_plt_lazy(const Obj_Entry *);
 int _rtld_relocate_plt_objects(const Obj_Entry *);
 void _rtld_setup_pltgot(const Obj_Entry *);

--- src/libexec/ld.elf_so/search.c 2010/08/07 19:47:34	1.22
+++ src/libexec/ld.elf_so/search.c 2010/12/24 12:41:43	1.23

 @@ -1,14 +1,14 @@
-/*	$NetBSD: search.c,v 1.22 2010/08/07 19:47:34 joerg Exp $	 */
+/*	$NetBSD: search.c,v 1.23 2010/12/24 12:41:43 skrll Exp $	 */
 /*
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * 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.
 @@ -28,27 +28,27 @@
  * 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.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: search.c,v 1.22 2010/08/07 19:47:34 joerg Exp $");
+__RCSID("$NetBSD: search.c,v 1.23 2010/12/24 12:41:43 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 @@ -57,75 +57,75 @@ __RCSID("$NetBSD: search.c,v 1.22 2010/0
 #include "debug.h"
 #include "rtld.h"
 /*
  * Data declarations.
  */
 Search_Path    *_rtld_invalid_paths;
 static Obj_Entry *_rtld_search_library_path(const char *, size_t,
     const char *, size_t, int);
 static Obj_Entry *
 _rtld_search_library_path(const char *name, size_t namelen,
-    const char *dir, size_t dirlen, int mode)
+    const char *dir, size_t dirlen, int flags)
+{
 	char pathname[MAXPATHLEN];
 	size_t pathnamelen;
 	Obj_Entry *obj;
 	Search_Path *sp;
 	pathnamelen = dirlen + 1 + namelen;
 	if (pathnamelen >= sizeof(pathname))
 		return NULL;
 	for (sp = _rtld_invalid_paths; sp != NULL; sp = sp->sp_next) {
 		if (sp->sp_pathlen == pathnamelen &&
 		    sp->sp_path[dirlen] == '/' &&
 		    !memcmp(name, sp->sp_path + dirlen + 1, namelen) &&
 		    !memcmp(dir, sp->sp_path, dirlen)) {
 			return NULL;
+		}
+	}
 	memcpy(pathname, dir, dirlen);
 	pathname[dirlen] = '/';
 	memcpy(pathname + dirlen + 1, name, namelen);
 	pathname[pathnamelen] = '\0';
 	dbg(("  Trying \"%s\"", pathname));
-	obj = _rtld_load_object(pathname, mode);
+	obj = _rtld_load_object(pathname, flags);
 	if (obj == NULL) {
 		Search_Path *path;
 		path = NEW(Search_Path);
 		path->sp_pathlen = pathnamelen;
 		path->sp_path = xstrdup(pathname);
 		path->sp_next = _rtld_invalid_paths;
 		_rtld_invalid_paths = path;
+	}
 	return obj;
+}
 /*
  * Find the library with the given name, and return its full pathname.
  * The returned string is dynamically allocated.  Generates an error
  * message and returns NULL if the library cannot be found.
+ *
  * If the second argument is non-NULL, then it refers to an already-
  * loaded shared object, whose library search path will be searched.
  */
 Obj_Entry *
-_rtld_load_library(const char *name, const Obj_Entry *refobj, int mode)
+_rtld_load_library(const char *name, const Obj_Entry *refobj, int flags)
+{
 	char tmperror[512], *tmperrorp;
 	Search_Path *sp;
 	const char *pathname;
 	int namelen;
 	Obj_Entry *obj;
 	if (strchr(name, '/') != NULL) {	/* Hard coded pathname */
 		if (name[0] != '/' && !_rtld_trust) {
 			_rtld_error(
 			"absolute pathname required for shared object \"%s\"",
 			    name);
 			return NULL;
 @@ -135,47 +135,58 @@ _rtld_load_library(const char *name, con
+	}
 	dbg((" Searching for \"%s\" (%p)", name, refobj));
 	tmperrorp = dlerror();
 	if (tmperrorp != NULL) {
 		strncpy(tmperror, tmperrorp, sizeof tmperror);
 		tmperrorp = tmperror;
+	}
 	namelen = strlen(name);
 	for (sp = _rtld_paths; sp != NULL; sp = sp->sp_next)
 		if ((obj = _rtld_search_library_path(name, namelen,
-		    sp->sp_path, sp->sp_pathlen, mode)) != NULL)
+		    sp->sp_path, sp->sp_pathlen, flags)) != NULL)
 			goto pathfound;
 	if (refobj != NULL)
 		for (sp = refobj->rpaths; sp != NULL; sp = sp->sp_next)
 			if ((obj = _rtld_search_library_path(name,
-			    namelen, sp->sp_path, sp->sp_pathlen, mode)) != NULL)
+			    namelen, sp->sp_path, sp->sp_pathlen, flags)) != NULL)
 				goto pathfound;
 	for (sp = _rtld_default_paths; sp != NULL; sp = sp->sp_next)
 		if ((obj = _rtld_search_library_path(name, namelen,
-		    sp->sp_path, sp->sp_pathlen, mode)) != NULL)
+		    sp->sp_path, sp->sp_pathlen, flags)) != NULL)
 			goto pathfound;
 	_rtld_error("Shared object \"%s\" not found", name);
 	return NULL;
 pathfound:
 	/*
 	 * The library has been found, but it couldn't be loaded for some
 	 * reason.
 	 */
 	if (obj == OBJ_ERR)
 		return NULL;
 	/*
 	 * Successfully found a library; restore the dlerror state as it was
 	 * before _rtld_load_library() was called (any failed call to
 	 * _rtld_search_library_path() will set the dlerror state, but if the
 	 * library was eventually found, then the error state should not
 	 * change.
 	 */
 	if (tmperrorp)
 		_rtld_error("%s", tmperror);
 	else
 		(void)dlerror();
 	return obj;
 found:
-	return _rtld_load_object(pathname, mode);
+	obj = _rtld_load_object(pathname, flags);
 	if (obj == OBJ_ERR)
 		return NULL;
 	return obj;
+}

--- src/share/man/man3/dlfcn.3 2010/01/24 22:54:14	1.27
+++ src/share/man/man3/dlfcn.3 2010/12/24 12:41:43	1.28

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: dlfcn.3,v 1.27 2010/01/24 22:54:14 wiz Exp $
+.\"	$NetBSD: dlfcn.3,v 1.28 2010/12/24 12:41:43 skrll Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Paul Kranenburg.
 .\"
 .\" 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
 @@ -55,87 +55,109 @@ dynamically linked program automatically
 .Ft "int"
 .Fn dlctl "void *handle" "int cmd" "void *data"
 .Ft "char *"
 .Fn dlerror "void"
 .Sh DESCRIPTION
 These functions provide an interface to the run-time linker
 .Xr ld.so 1 .
 They allow new shared objects to be loaded into the process' address space
 under program control.
 .Pp
 The
 .Fn dlopen
 function takes the name of a shared object as the first argument.
 The shared object is mapped into the address space, relocated, and
 its external references are resolved in the same way as is done
 with the implicitly loaded shared libraries at program startup.
 .Pp
 The
 .Fa path
 argument can be specified as either an absolute pathname to a shared object
 or just the name of the shared object itself.
 When an absolute pathname is specified,
 only the path provided will be searched.
-When just a shared object name is specified, the same search rules apply that are
+When just a shared object name is specified, the same search rules apply that
-used for
+are used for
 .Dq intrinsic
 shared object searches.
 .Po
 see
 .Xr ld.elf_so 5
 .Pc
 .Pp
 Shared libraries take the following form:
 .Do lib Ns Ao name Ac Ns .so Ns Oo .xx Ns Oo .yy Oc Oc Dc .
 .Pp
 The shared object is mapped into the address space, relocated, and
 its external references are resolved in the same way as is done
 with the implicitly loaded shared libraries at program startup.
 .Pp
 The
 If the first argument is
 .Dv NULL ,
 .Fn dlopen
 returns a
 .Fa handle
 on the global symbol object.
 This object
 provides access to all symbols from an ordered set of objects consisting
 of the original program image and any dependencies loaded during startup.
 .Pp
 The
 .Fa mode
 parameter specifies symbol resolution time and symbol visibility.
 One of the following values may be used to specify symbol resolution time:
-.Bl -tag -width "RTLD_LAZYXX" -offset indent
+.Bl -tag -width "RTLD_GLOBALXX" -offset indent
 .It Dv RTLD_NOW
 Symbols are resolved immediately.
 .It Dv RTLD_LAZY
 Symbols are resolved when they are first referred to.
 This is the default value if resolution time is unspecified.
 .El
 .Pp
 One of the following values may be used to specify symbol visibility:
 .Pp
-.Bl -tag -width "RTLD_GLOBAL" -compact -offset indent
+.Bl -tag -width "RTLD_GLOBALXX" -offset indent
 .It Dv RTLD_GLOBAL
 The object's symbols and the symbols of its dependencies will be visible to
 other objects.
 .It Dv RTLD_LOCAL
 The object's symbols and the symbols of its dependencies will not be visible to
 other objects.
 This is the default value if visibility is unspecified.
 .El
 .Pp
 To specify both resolution time and visibility, bitwise inclusive OR one of
 each of the above values together.
 If an object was opened with
 .Dv RTLD_LOCAL
 and later opened with
 .Dv RTLD_GLOBAL ,
 then it is promoted to
 .Dv RTLD_GLOBAL .
 .Pp
 Additionally, one of the following flags may be ORed into the
 .Fa mode
 argument:
 .Bl -tag -width "RTLD_NODELETEXX" -offset indent
 .It Dv RTLD_NODELETE
 Prevents unload of the loaded object on
 .Fn dlclose .
 The same behaviour may be requested by
 .Fl "z nodelete"
 option of the static linker
 .Xr ld 1 .
 .It Dv RTLD_NOLOAD
 Only return valid handle for the object if it is already loaded in
 the process address space, otherwise do not load the object and return
 .Dv NULL .
 .El
 .Pp
 .Fn dlopen
 returns a
 .Fa handle
 to be used in calls to
 .Fn dlclose ,
 .Fn dlsym ,
 and
 .Fn dlctl .
 If the named shared object has already
 been loaded by a previous call to
 .Fn dlopen
 .Pq and not yet unloaded by Fn dlclose ,
+a
 @@ -182,33 +204,33 @@ with the --export-dynamic option where a
 visible.
 The following special
 .Fa handle
 values may be used with
 .Fn dlsym :
 .Bl -tag -width "RTLD_DEFAULTXX" -offset indent
 .It Dv NULL
 Interpreted as a reference to the executable or shared object
 from which the call is being made.
 Thus an object can reference its own symbols and the symbols of its
 dependencies without calling
 .Fn dlopen .
 .It Dv RTLD_DEFAULT
-All the visible shared objects and the executable will be searched in the order they
+All the visible shared objects and the executable will be searched in the order
-were loaded.
+they were loaded.
 .It Dv RTLD_NEXT
 The search for
 .Fa symbol
-is limited to the visible shared objects which were loaded after the one issuing the
+is limited to the visible shared objects which were loaded after the one
-call to
+issuing the call to
 .Fn dlsym .
 Thus, if
 .Fn dlsym
 is called from the main program, all the visible shared libraries are searched.
 If it is called from a shared library, all subsequently visible shared
 libraries are searched.
 .It Dv RTLD_SELF
 The search for
 .Fa symbol
 is limited to the shared object issuing the call to
 .Fn dlsym
 and those shared objects which were loaded after it that are visible.
 .El

--- src/sys/sys/exec_elf.h 2010/12/13 19:37:32	1.107
+++ src/sys/sys/exec_elf.h 2010/12/24 12:41:43	1.108

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec_elf.h,v 1.107 2010/12/13 19:37:32 joerg Exp $	*/
+/*	$NetBSD: exec_elf.h,v 1.108 2010/12/24 12:41:43 skrll Exp $	*/
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -658,27 +658,30 @@ typedef struct {
 #define	DT_LOOS		0x60000000	/* Operating system specific range */
 #define DT_VERSYM	0x6ffffff0	/* Symbol versions */
 #define	DT_FLAGS_1	0x6ffffffb	/* ELF dynamic flags */
 #define DT_VERDEF	0x6ffffffc	/* Versions defined by file */
 #define DT_VERDEFNUM	0x6ffffffd	/* Number of versions defined by file */
 #define DT_VERNEED	0x6ffffffe	/* Versions needed by file */
 #define DT_VERNEEDNUM	0x6fffffff	/* Number of versions needed by file */
 #define	DT_HIOS		0x6fffffff
 #define	DT_LOPROC	0x70000000	/* Processor-specific range */
 #define	DT_HIPROC	0x7fffffff
 /* Flag values for DT_FLAGS_1 (incomplete) */
 #define	DF_1_BIND_NOW	0x00000001	/* Same as DF_BIND_NOW */
 #define	DF_1_NODELETE	0x00000008	/* Set the RTLD_NODELETE for object */
 #define	DF_1_INITFIRST	0x00000020	/* Object's init/fini take priority */
 #define	DF_1_NOOPEN	0x00000040	/* Do not allow loading on dlopen() */
 /*
  * Auxiliary Vectors
  */
 typedef struct {
 	Elf32_Word	a_type;				/* 32-bit id */
 	Elf32_Word	a_v;				/* 32-bit id */
 } Aux32Info;
 typedef struct {
 	Elf64_Word	a_type;				/* 32-bit id */
 	Elf64_Xword	a_v;				/* 64-bit id */
 } Aux64Info;

--- src/tests/libexec/ld.elf_so/Makefile 2010/12/14 05:57:32	1.2
+++ src/tests/libexec/ld.elf_so/Makefile 2010/12/24 12:41:43	1.3

 @@ -1,12 +1,24 @@
 # $NetBSD
+#
 NOMAN=		# defined
 .include <bsd.own.mk>
 TESTSDIR=	${TESTSBASE}/libexec/ld.elf_so
 TESTS_C+=	t_dlerror-cleared t_dlerror-false t_dlinfo
 LDADD.t_dlerror-false=	-Wl,-rpath,/var/nonexistent/lib
 TESTS_SH+=		t_df_1_noopen
 BINDIR=			${TESTSDIR}
 PROGS+=			h_df_1_noopen1
 SRCS.h_df_1_noopen1=	h_df_1_noopen.c
 PROGS+=			h_df_1_noopen2
 SRCS.h_df_1_noopen2=	h_df_1_noopen.c
 LDADD.h_df_1_noopen2=	-lpthread
 .include <bsd.test.mk>

/*-
 * Copyright (c) 2010 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * This code is derived from software contributed to The NetBSD Foundation
 * by
 *
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * 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.
 */

#include <stdio.h>
#include <dlfcn.h>
#include <err.h>
#include <unistd.h>

int
main(void)
{
	void *handle;

	handle = dlopen("libpthread.so", RTLD_NOLOAD);
	if (handle == NULL)
		errx(1, dlerror());

	printf("libpthread loaded successfully\n");
	return 0;
}

# $NetBSD: t_df_1_noopen.sh,v 1.1 2010/12/24 12:41:43 skrll Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
# by
#
# 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.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# 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.
#

atf_test_case df_1_noopen1
df_1_noopen1_head()
{
	atf_set "descr" "Checks DF_1_NOOPEN prevents dlopening of library"
}
df_1_noopen1_body()
{
	cat >expout <<EOF
h_df_1_noopen1: Cannot dlopen non-loadable /usr/lib/libpthread.so
EOF

	atf_check -o file:expout "$(atf_get_srcdir)/h_df_1_noopen1"
	atf_expect_exit 1 "libpthread is marked DF_1_NOOPEN"
}

atf_test_case df_1_noopen2
df_1_noopen2_head()
{
	atf_set "descr" "Checks DF_1_NOOPEN is allowed on already loaded library"
}
df_1_noopen2_body()
{
	cat >expout <<EOF
libpthread loaded successfully
EOF

	atf_check -o file:expout "$(atf_get_srcdir)/h_df_1_noopen2"
}

atf_init_test_cases()
{
	atf_add_test_case df_1_noopen1
	atf_add_test_case df_1_noopen2
}