mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: Remove __libc_init_secure

Browse Source 
After 73fc4e28b9,
__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
22b79ed7f4.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
(cherry picked from commit 3e9acce8c5)
This commit is contained in:
Fangrui Song 2022-04-19 15:52:27 -07:00 committed by Florian Weimer
parent ff900fad89
commit be9240c84c
8 changed files with 0 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
csu/libc-start.c
View File

@ -285,9 +285,6 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
}
}
/* Initialize very early so that tunables can use it. */
__libc_init_secure ();
__tunables_init (__environ);
ARCH_INIT_CPU_FEATURES ();

10
elf/enbl-secure.c
View File

@ -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 ());
}

3
include/libc-internal.h
View File

@ -21,9 +21,6 @@
#include <hp-timing.h>
/* Initialize the `__libc_enable_secure' flag. */
extern void __libc_init_secure (void);
/* Discover the tick frequency of the machine if something goes wrong,
we return 0, an impossible hertz. */
extern int __profile_frequency (void);

1
include/unistd.h
View File

@ -180,7 +180,6 @@ libc_hidden_proto (__sbrk)
and some functions contained in the C library ignore various
environment variables that normally affect them. */
extern int __libc_enable_secure attribute_relro;
extern int __libc_enable_secure_decided;
rtld_hidden_proto (__libc_enable_secure)

24
sysdeps/generic/startup.h
View File

@ -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 ();
}

30
sysdeps/mach/hurd/enbl-secure.c
View File

@ -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)
{
}

4
sysdeps/mach/hurd/i386/init-first.c
View File

@ -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;

24
sysdeps/unix/sysv/linux/i386/startup.h
View File

@ -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