From 3e9acce8c50883b6cd8a3fb653363d9fa21e1608 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Tue, 19 Apr 2022 15:52:27 -0700 Subject: 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 --- elf/enbl-secure.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'elf') 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 #include -/* 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 ()); -} -- cgit 1.4.1