diff options
author | Fangrui Song <maskray@google.com> | 2022-04-19 15:52:27 -0700 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2022-05-19 12:13:52 +0200 |
commit | be9240c84c67de44959905a829141576965a0588 (patch) | |
tree | 10a3c77b067cf33b5a9074bf7e71f98e8fbd5131 /sysdeps/mach | |
parent | ff900fad89df7fa12750c018993a12cc02474646 (diff) | |
download | glibc-be9240c84c67de44959905a829141576965a0588.tar.gz glibc-be9240c84c67de44959905a829141576965a0588.tar.xz glibc-be9240c84c67de44959905a829141576965a0588.zip |
elf: Remove __libc_init_secure
After 73fc4e28b9464f0e13edc719a5372839970e7ddb, __libc_enable_secure_decided is always 0 and a statically linked executable may overwrite __libc_enable_secure without considering AT_SECURE. The __libc_enable_secure has been correctly initialized in _dl_aux_init, so just remove __libc_enable_secure_decided and __libc_init_secure. This allows us to remove some startup_get*id functions from 22b79ed7f413cd980a7af0cf258da5bf82b6d5e5. Reviewed-by: Florian Weimer <fweimer@redhat.com> (cherry picked from commit 3e9acce8c50883b6cd8a3fb653363d9fa21e1608)
Diffstat (limited to 'sysdeps/mach')
-rw-r--r-- | sysdeps/mach/hurd/enbl-secure.c | 30 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 4 |
2 files changed, 0 insertions, 34 deletions
diff --git a/sysdeps/mach/hurd/enbl-secure.c b/sysdeps/mach/hurd/enbl-secure.c deleted file mode 100644 index 3e9a6b888d..0000000000 --- a/sysdeps/mach/hurd/enbl-secure.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Define and initialize the `__libc_enable_secure' flag. Hurd version. - Copyright (C) 1998-2021 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 - <https://www.gnu.org/licenses/>. */ - -/* There is no need for this file in the Hurd; it is just a placeholder - to prevent inclusion of the sysdeps/generic version. - In the shared library, the `__libc_enable_secure' variable is defined - by the dynamic linker in dl-sysdep.c and set there. - In the static library, it is defined in init-first.c and set there. */ - -#include <libc-internal.h> - -void -__libc_init_secure (void) -{ -} diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index a430aae085..4dc9017ec8 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -38,10 +38,6 @@ extern void __init_misc (int, char **, char **); unsigned long int __hurd_threadvar_stack_offset; unsigned long int __hurd_threadvar_stack_mask; -#ifndef SHARED -int __libc_enable_secure; -#endif - extern int __libc_argc attribute_hidden; extern char **__libc_argv attribute_hidden; extern char **_dl_argv; |