about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2022-04-19 15:52:27 -0700
committerFlorian Weimer <fweimer@redhat.com>2022-05-17 08:08:52 +0200
commit58bb3aeaae711d2229bacfc784b7879af2e4f771 (patch)
treedb81b3e6b0940830b8e09af8b0e046fd9b4c5f7a /elf
parent0a5c6c9d99073c0772a9753600f0d8885efa9163 (diff)
downloadglibc-58bb3aeaae711d2229bacfc784b7879af2e4f771.tar.gz
glibc-58bb3aeaae711d2229bacfc784b7879af2e4f771.tar.xz
glibc-58bb3aeaae711d2229bacfc784b7879af2e4f771.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 'elf')
-rw-r--r--elf/enbl-secure.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/elf/enbl-secure.c b/elf/enbl-secure.c
index aa2a0bd877..4e4d66822b 100644
--- a/elf/enbl-secure.c
+++ b/elf/enbl-secure.c
@@ -26,15 +26,5 @@
 #include <startup.h>
 #include <libc-internal.h>
 
-/* If nonzero __libc_enable_secure is already set.  */
-int __libc_enable_secure_decided;
 /* Safest assumption, if somehow the initializer isn't run.  */
 int __libc_enable_secure = 1;
-
-void
-__libc_init_secure (void)
-{
-  if (__libc_enable_secure_decided == 0)
-    __libc_enable_secure = (startup_geteuid () != startup_getuid ()
-			    || startup_getegid () != startup_getgid ());
-}