From 1411af221c85f9bab89ed87a9142cc6a736bea38 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Fri, 10 Jan 2020 22:21:25 +0000 Subject: [PATCH] local-revert-24323 Gbp-Pq: Topic any Gbp-Pq: Name local-revert-24323.diff --- ChangeLog | 12 ----------- elf/Makefile | 4 +--- elf/dl-load.c | 18 ++++------------ elf/tst-dlopen-pie.c | 49 -------------------------------------------- include/elf.h | 2 +- 5 files changed, 6 insertions(+), 79 deletions(-) delete mode 100644 elf/tst-dlopen-pie.c diff --git a/ChangeLog b/ChangeLog index 596604df0..3b3c10c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,18 +77,6 @@ * support/xposix_memalign.c: New File. * support/xpthread_attr_setstack.c: Likewise. -2019-06-18 Florian Weimer - - [BZ #24323] - * include/elf.h (DT_1_SUPPORTED_MASK): Include DF_1_PIE. - * elf/dl-load.c (_dl_map_object_from_fd): Check for DF_1_PIE and - fail when called from dlopen. - * elf/Makefile [have-fpie && build-shared] (tests): Add - tst-dlopen-pie. - (tst-dlopen-pie): Link with -ldl. - (tst-dlopen-pie.out): Add run-time dependency on tst-pie1. - * elf/tst-dlopen-pie.c (do_test): New file. - 2019-07-10 DJ Delorie Sergei Trofimovich diff --git a/elf/Makefile b/elf/Makefile index b9e243b47..f78c156be 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -305,7 +305,7 @@ test-xfail-tst-protected1b = yes endif ifeq (yesyes,$(have-fpie)$(build-shared)) modules-names += tst-piemod1 -tests += tst-pie1 tst-pie2 tst-dlopen-pie +tests += tst-pie1 tst-pie2 tests-pie += tst-pie1 tst-pie2 ifeq (yes,$(have-protected-data)) tests += vismain @@ -1066,8 +1066,6 @@ CFLAGS-tst-pie2.c += $(pie-ccflag) $(objpfx)tst-piemod1.so: $(libsupport) $(objpfx)tst-pie1: $(objpfx)tst-piemod1.so -$(objpfx)tst-dlopen-pie: $(libdl) -$(objpfx)tst-dlopen-pie.out: $(objpfx)tst-pie1 ifeq (yes,$(build-shared)) # NB: Please keep cet-built-dso in sysdeps/x86/Makefile in sync with diff --git a/elf/dl-load.c b/elf/dl-load.c index 5818a86e5..5bd48f16c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1173,10 +1173,6 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, goto call_lose; } - /* dlopen of an executable is not valid because it is not possible - to perform proper relocations, handle static TLS, or run the - ELF constructors. For PIE, the check needs the dynamic - section, so there is another check below. */ if (__glibc_unlikely (type != ET_DYN) && __glibc_unlikely ((mode & __RTLD_OPENEXEC) == 0)) { @@ -1213,11 +1209,9 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, elf_get_dynamic_info (l, NULL); /* Make sure we are not dlopen'ing an object that has the - DF_1_NOOPEN flag set, or a PIE object. */ - if ((__glibc_unlikely (l->l_flags_1 & DF_1_NOOPEN) - && (mode & __RTLD_DLOPEN)) - || (__glibc_unlikely (l->l_flags_1 & DF_1_PIE) - && __glibc_unlikely ((mode & __RTLD_OPENEXEC) == 0))) + DF_1_NOOPEN flag set. */ + if (__glibc_unlikely (l->l_flags_1 & DF_1_NOOPEN) + && (mode & __RTLD_DLOPEN)) { /* We are not supposed to load this object. Free all resources. */ _dl_unmap_segments (l); @@ -1228,11 +1222,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, if (l->l_phdr_allocated) free ((void *) l->l_phdr); - if (l->l_flags_1 & DF_1_PIE) - errstring - = N_("cannot dynamically load position-independent executable"); - else - errstring = N_("shared object cannot be dlopen()ed"); + errstring = N_("shared object cannot be dlopen()ed"); goto call_lose; } diff --git a/elf/tst-dlopen-pie.c b/elf/tst-dlopen-pie.c deleted file mode 100644 index 6a41c731c..000000000 --- a/elf/tst-dlopen-pie.c +++ /dev/null @@ -1,49 +0,0 @@ -/* dlopen test for PIE objects. - Copyright (C) 2019 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* This test attempts to open the (otherwise unrelated) PIE test - program elf/tst-pie1 and expects the attempt to fail. */ - -#include -#include -#include -#include -#include - -static void -test_mode (int mode) -{ - char *pie_path = xasprintf ("%s/elf/tst-pie1", support_objdir_root); - if (dlopen (pie_path, mode) != NULL) - FAIL_EXIT1 ("dlopen succeeded unexpectedly (%d)", mode); - const char *message = dlerror (); - const char *expected - = "cannot dynamically load position-independent executable"; - if (strstr (message, expected) == NULL) - FAIL_EXIT1 ("unexpected error message (mode %d): %s", mode, message); -} - -static int -do_test (void) -{ - test_mode (RTLD_LAZY); - test_mode (RTLD_NOW); - return 0; -} - -#include diff --git a/include/elf.h b/include/elf.h index 14ed67ff6..ab76aafb1 100644 --- a/include/elf.h +++ b/include/elf.h @@ -23,7 +23,7 @@ # endif # define DT_1_SUPPORTED_MASK \ (DF_1_NOW | DF_1_NODELETE | DF_1_INITFIRST | DF_1_NOOPEN \ - | DF_1_ORIGIN | DF_1_NODEFLIB | DF_1_PIE) + | DF_1_ORIGIN | DF_1_NODEFLIB) #endif /* !_ISOMAC */ #endif /* elf.h */ -- 2.30.2