From 035c012e32c11e84d64905efaf55e74f704d3668 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 25 Feb 2021 12:10:57 +0100 Subject: Reduce the statically linked startup code [BZ #23323] It turns out the startup code in csu/elf-init.c has a perfect pair of ROP gadgets (see Marco-Gisbert and Ripoll-Ripoll, "return-to-csu: A New Method to Bypass 64-bit Linux ASLR"). These functions are not needed in dynamically-linked binaries because DT_INIT/DT_INIT_ARRAY are already processed by the dynamic linker. However, the dynamic linker skipped the main program for some reason. For maximum backwards compatibility, this is not changed, and instead, the main map is consulted from __libc_start_main if the init function argument is a NULL pointer. For statically linked binaries, the old approach based on linker symbols is still used because there is nothing else available. A new symbol version __libc_start_main@@GLIBC_2.34 is introduced because new binaries running on an old libc would not run their ELF constructors, leading to difficult-to-debug issues. --- elf/dl-init.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'elf/dl-init.c') diff --git a/elf/dl-init.c b/elf/dl-init.c index b7e4b8a3af..f924d26642 100644 --- a/elf/dl-init.c +++ b/elf/dl-init.c @@ -22,10 +22,6 @@ #include -/* Type of the initializer. */ -typedef void (*init_t) (int, char **, char **); - - static void call_init (struct link_map *l, int argc, char **argv, char **env) { @@ -71,7 +67,7 @@ call_init (struct link_map *l, int argc, char **argv, char **env) addrs = (ElfW(Addr) *) (init_array->d_un.d_ptr + l->l_addr); for (j = 0; j < jm; ++j) - ((init_t) addrs[j]) (argc, argv, env); + ((dl_init_t) addrs[j]) (argc, argv, env); } } @@ -103,7 +99,7 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env) addrs = (ElfW(Addr) *) (preinit_array->d_un.d_ptr + main_map->l_addr); for (cnt = 0; cnt < i; ++cnt) - ((init_t) addrs[cnt]) (argc, argv, env); + ((dl_init_t) addrs[cnt]) (argc, argv, env); } /* Stupid users forced the ELF specification to be changed. It now -- cgit v1.2.3