mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
* sysdeps/i386/dl-machine.h (RTLD_START): Set __libc_stack_end before
calling _dl_start, using GOTOFF access. * configure.in (libc_cv_z_execstack): New check. * configure: Regenerated. * config.make.in (have-z-execstack): New variable set by it. * elf/tst-execstack.c: New file. * elf/tst-execstack-mod.c: New file. * elf/tst-execstack-needed.c: New file. * elf/Makefile (tests-execstack-yes, modules-execstack-yes): New variables. (tests, modules-names): Conditionally include them. (distribute): Add tst-execstack-mod.c here. ($(objpfx)tst-execstack, $(objpfx)tst-execstack.out): New targets. (LDFLAGS-tst-execstack, LDFLAGS-tst-execstack-mod): New variables. ($(objpfx)tst-execstack-needed): New target. (LDFLAGS-tst-execstack-needed): New variable. * sysdeps/generic/ldsodefs.h (struct rtld_global): Add _dl_stack_flags and _dl_make_stack_executable_hook. Declare _dl_make_stack_executable. * elf/rtld.c (_rtld_global): Add initializer for _dl_stack_flags. (dl_main): Reset _dl_stack_flags according to PT_GNU_STACK phdr. Initialize _dl_make_stack_executable_hook. * elf/dl-support.c: Define those new variables. (_dl_non_dynamic_init): Scan phdrs for PT_GNU_STACK. (_dl_phdr): Fix type. * elf/dl-load.c (_dl_map_object_from_fd): Grok PT_GNU_STACK phdr and enable execute permission for the stack if necessary. * sysdeps/generic/dl-execstack.c: New file. * elf/Makefile (dl-routines): Add it. * elf/Versions (ld: GLIBC_PRIVATE): Add _dl_make_stack_executable. * sysdeps/unix/sysv/linux/dl-execstack.c: New file.
This commit is contained in:
30
elf/tst-execstack-mod.c
Normal file
30
elf/tst-execstack-mod.c
Normal file
@ -0,0 +1,30 @@
|
||||
/* Test module for making nonexecutable stacks executable
|
||||
on load of a DSO that requires executable stacks. */
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
void callme (void (*callback) (void));
|
||||
|
||||
/* This is a function that makes use of executable stack by
|
||||
using a local function trampoline. */
|
||||
void
|
||||
tryme (void)
|
||||
{
|
||||
bool ok = false;
|
||||
void callback (void) { ok = true; }
|
||||
|
||||
callme (&callback);
|
||||
|
||||
if (ok)
|
||||
printf ("DSO called ok (local %p, trampoline %p)\n", &ok, &callback);
|
||||
else
|
||||
abort ();
|
||||
}
|
||||
|
||||
void
|
||||
callme (void (*callback) (void))
|
||||
{
|
||||
(*callback) ();
|
||||
}
|
Reference in New Issue
Block a user