diff options
author | Fangrui Song <maskray@google.com> | 2022-04-19 15:52:27 -0700 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2022-04-19 15:52:27 -0700 |
commit | 3e9acce8c50883b6cd8a3fb653363d9fa21e1608 (patch) | |
tree | c69a7776edef12dd1dbd98f8c7fc2e50432e3758 /sysdeps | |
parent | 78fb88827362fbd2cc8aa32892ae5b015106e25c (diff) | |
download | glibc-3e9acce8c50883b6cd8a3fb653363d9fa21e1608.tar.gz glibc-3e9acce8c50883b6cd8a3fb653363d9fa21e1608.tar.xz glibc-3e9acce8c50883b6cd8a3fb653363d9fa21e1608.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>
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/startup.h | 24 | ||||
-rw-r--r-- | sysdeps/mach/hurd/enbl-secure.c | 30 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/startup.h | 24 |
4 files changed, 0 insertions, 82 deletions
diff --git a/sysdeps/generic/startup.h b/sysdeps/generic/startup.h index 99509404eb..45979ab231 100644 --- a/sysdeps/generic/startup.h +++ b/sysdeps/generic/startup.h @@ -23,27 +23,3 @@ /* Use macro instead of inline function to avoid including <stdio.h>. */ #define _startup_fatal(message) __libc_fatal ((message)) - -static inline uid_t -startup_getuid (void) -{ - return __getuid (); -} - -static inline uid_t -startup_geteuid (void) -{ - return __geteuid (); -} - -static inline gid_t -startup_getgid (void) -{ - return __getgid (); -} - -static inline gid_t -startup_getegid (void) -{ - return __getegid (); -} diff --git a/sysdeps/mach/hurd/enbl-secure.c b/sysdeps/mach/hurd/enbl-secure.c deleted file mode 100644 index 8c02789ecf..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-2022 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 1229b59114..534a796e0d 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; diff --git a/sysdeps/unix/sysv/linux/i386/startup.h b/sysdeps/unix/sysv/linux/i386/startup.h index aab8e26ca7..67c9310f3a 100644 --- a/sysdeps/unix/sysv/linux/i386/startup.h +++ b/sysdeps/unix/sysv/linux/i386/startup.h @@ -32,30 +32,6 @@ _startup_fatal (const char *message __attribute__ ((unused))) ABORT_INSTRUCTION; __builtin_unreachable (); } - -static inline uid_t -startup_getuid (void) -{ - return (uid_t) INTERNAL_SYSCALL_CALL (getuid32); -} - -static inline uid_t -startup_geteuid (void) -{ - return (uid_t) INTERNAL_SYSCALL_CALL (geteuid32); -} - -static inline gid_t -startup_getgid (void) -{ - return (gid_t) INTERNAL_SYSCALL_CALL (getgid32); -} - -static inline gid_t -startup_getegid (void) -{ - return (gid_t) INTERNAL_SYSCALL_CALL (getegid32); -} #else # include_next <startup.h> #endif |