+2004-01-13 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/dl-execstack.c: Change interface. Add
+ challenge for caller.
+ * sysdeps/generic/ldsodefs.h: Change declaration and type of hook
+ member in rtld_global appropriately.
+ * elf/dl-support.c: Likewise.
+ * elf/dl-load.c (_dl_map_object_from_fd): Take additional paramter.
+ Pass it on to the changed function.
+ (_dl_map_object): Pass new parameter to _dl_map_object_from_fd.
+
2004-01-13 Richard Henderson <rth@redhat.com>
* sysdeps/alpha/bits/atomic.h (__arch_compare_and_exchange_xxx_8_int):
struct link_map *
_dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
char *realname, struct link_map *loader, int l_type,
- int mode)
+ int mode, void **stack_endp)
{
struct link_map *l = NULL;
const ElfW(Ehdr) *header;
{
/* The stack is presently not executable, but this module
requires that it be executable. */
- errval = (*GL(dl_make_stack_executable_hook)) ();
+ errval = (*GL(dl_make_stack_executable_hook)) (stack_endp);
if (errval)
{
errstring = N_("\
N_("cannot open shared object file"));
}
- return _dl_map_object_from_fd (name, fd, &fb, realname, loader, type, mode);
+ extern void *__libc_stack_end;
+ void *stack_end = __libc_stack_end;
+ return _dl_map_object_from_fd (name, fd, &fb, realname, loader, type, mode,
+ &stack_end);
}
INTDEF (_dl_map_object)
/* Support for dynamic linking code in static libc.
- Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1996-2002, 2003, 2004 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
/* If loading a shared object requires that we make the stack executable
when it was not, we do it by calling this function.
It returns an errno code or zero on success. */
-int (*_dl_make_stack_executable_hook) (void) internal_function
+int (*_dl_make_stack_executable_hook) (void **) internal_function
= _dl_make_stack_executable;
+2004-01-13 Ulrich Drepper <drepper@redhat.com>
+
+ * allocatestack.c (__make_stacks_executable): Change interface.
+ Check parameters. Pass parameter on to libc counterpart.
+ * pthreadP.h: Change declaration.
+
2004-01-13 Richard Henderson <rth@redhat.com>
- * sysdeps/alpha/Makefile: New file.
- * sysdeps/alpha/tcb-offsets.sym: New file.
- * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (SINGLE_THREAD_P):
- Use MULTIPLE_THREADS_OFFSET to implement !libpthread !libc version.
+ * sysdeps/alpha/Makefile: New file.
+ * sysdeps/alpha/tcb-offsets.sym: New file.
+ * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (SINGLE_THREAD_P):
+ Use MULTIPLE_THREADS_OFFSET to implement !libpthread !libc version.
- * sysdeps/unix/sysv/linux/alpha/lowlevellock.h: Rewrite based
- on powerpc version.
+ * sysdeps/unix/sysv/linux/alpha/lowlevellock.h: Rewrite based
+ on powerpc version.
2004-01-08 Jakub Jelinek <jakub@redhat.com>
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
}
+extern void *__libc_stack_end;
+
int
internal_function
-__make_stacks_executable (void)
+__make_stacks_executable (void **stack_endp)
{
+ /* Challenge the caller. */
+ if (*stack_endp != __libc_stack_end)
+ return EPERM;
+
#ifdef NEED_SEPARATE_REGISTER_STACK
const size_t pagemask = ~(__getpagesize () - 1);
#endif
lll_unlock (stack_cache_lock);
if (err == 0)
- err = _dl_make_stack_executable ();
+ err = _dl_make_stack_executable (stack_endp);
return err;
}
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
extern void __reclaim_stacks (void) attribute_hidden;
/* Make all threads's stacks executable. */
-int __make_stacks_executable (void) internal_function attribute_hidden;
+extern int __make_stacks_executable (void **stack_endp)
+ internal_function attribute_hidden;
/* longjmp handling. */
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
/* Run-time dynamic linker data structures for loaded ELF shared objects.
- Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1995-2002, 2003, 2004 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
/* If loading a shared object requires that we make the stack executable
when it was not, we do it by calling this function.
It returns an errno code or zero on success. */
- EXTERN int (*_dl_make_stack_executable_hook) (void) internal_function;
+ EXTERN int (*_dl_make_stack_executable_hook) (void **) internal_function;
/* Keep the conditional TLS members at the end so the layout of the
structure used by !USE_TLS code matches the prefix of the layout in
/* This is the initial value of GL(dl_make_stack_executable_hook).
A threads library can change it. */
-extern int _dl_make_stack_executable (void) internal_function;
+extern int _dl_make_stack_executable (void **stack_endp) internal_function;
rtld_hidden_proto (_dl_make_stack_executable)
/* Parameters passed to the dynamic linker. */