summary refs log tree commit diff
path: root/dlfcn/dlopen.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-01-13 02:08:37 +0000
committerUlrich Drepper <drepper@redhat.com>2005-01-13 02:08:37 +0000
commit3e539cb47e9fabfdda295926b4270b0f3cc7fa65 (patch)
tree12514bb60d33e94928e47d00f758d43debd7aa02 /dlfcn/dlopen.c
parent1b85ed0ce299a8044e8417ca82e85cf6267d520a (diff)
downloadglibc-3e539cb47e9fabfdda295926b4270b0f3cc7fa65.tar.gz
glibc-3e539cb47e9fabfdda295926b4270b0f3cc7fa65.tar.xz
glibc-3e539cb47e9fabfdda295926b4270b0f3cc7fa65.zip
* elf/dl-load.c (_dl_map_object_from_fd): We don't have to allow
	callers from libc anymore.

	* elf/dl-open.c (dl_open_worker): Pass __RTLD_AUDIT flag from caller
	to _dl_map_object_deps.
	* elf/dl-load.c (_dl_map_object_from_fd): Don't change memory
	protections when loading auditing modules.

	* dlfcn/dlopen.c (dlopen_doit): Catch invalid mode arguments and fail.
Diffstat (limited to 'dlfcn/dlopen.c')
-rw-r--r--dlfcn/dlopen.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 1e2111e71f..bffb512aa3 100644
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -1,5 +1,5 @@
 /* Load a shared object at run time.
-   Copyright (C) 1995,96,97,98,99,2000,2003,2004 Free Software Foundation, Inc.
+   Copyright (C) 1995-2000,2003,2004,2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include <dlfcn.h>
+#include <libintl.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <ldsodefs.h>
@@ -58,6 +59,10 @@ dlopen_doit (void *a)
 {
   struct dlopen_args *args = (struct dlopen_args *) a;
 
+  if (args->mode & ~(RTLD_BINDING_MASK | RTLD_NOLOAD | RTLD_DEEPBIND
+		     | RTLD_GLOBAL | RTLD_LOCAL | RTLD_NODELETE))
+    GLRO(dl_signal_error) (0, NULL, NULL, _("invalid mode parameter"));
+
   args->new = GLRO(dl_open) (args->file ?: "", args->mode | __RTLD_DLOPEN,
 			     args->caller,
 			     args->file == NULL ? LM_ID_BASE : NS,