From cddcfecfd1a8f91ee1da1c0147a4f07aee1846a0 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 29 Jul 1996 00:18:42 +0000 Subject: Sat Jul 27 13:02:09 1996 Ulrich Drepper * elf/rtld.c (dl_main): Ignore arguments when environment variable LD_TRACE_LOADED_OBJECTS is set. Sun Jul 28 19:42:51 1996 Roland McGrath * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Initialize __libc_enable_secure instead of _dl_secure. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise. * elf/dl-load.c (_dl_map_object): Check __libc_enable_secure instead of _dl_secure. * elf/Makefile (routines): Add enbl-secure. (elide-routines.so): Here too. * sysdeps/generic/enbl-secure.c: New file. * posix/unistd.h [__USE_GNU]: Declare `__libc_enable_secure' flag. * elf/dl-support.c (_dl_secure): Variable removed. * elf/rtld.c: Likewise. Replace all uses with __libc_enable_secure. Sun Jul 28 19:26:40 1996 David S. Miller * sysdeps/mips/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Declare _dl_runtime_resolve with __attribute__ ((unused)) so the compiler doesn't elide it. (elf_machine_rel): Follow Jul 14 change in sysdeps/i386/dl-machine.h. --- sysdeps/generic/dl-sysdep.c | 2 +- sysdeps/generic/enbl-secure.c | 34 ++++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/dl-sysdep.c | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 sysdeps/generic/enbl-secure.c (limited to 'sysdeps') diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 87eac71687..a4b8639bc4 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -96,7 +96,7 @@ _dl_sysdep_start (void **start_argptr, SEE (EGID, egid); - _dl_secure = uid != euid || gid != egid; + __libc_enable_secure = uid != euid || gid != egid; #ifdef DL_SYSDEP_INIT DL_SYSDEP_INIT; diff --git a/sysdeps/generic/enbl-secure.c b/sysdeps/generic/enbl-secure.c new file mode 100644 index 0000000000..b7530a8437 --- /dev/null +++ b/sysdeps/generic/enbl-secure.c @@ -0,0 +1,34 @@ +/* Define and initialize the `__libc_enable_secure' flag. Generic version. +Copyright (C) 1996 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +/* This file is used in the static libc. For the shared library, + dl-sysdep.c defines and initializes __libc_enable_secure. */ + +#include + + +/* Safest assumption, if somehow the initializer isn't run. */ +int __libc_enable_secure = 1; + +static void __attribute__ ((unused, constructor)) +init_secure (void) +{ + __libc_enable_secure = (__geteuid () != __getuid () || + __getegid () != __getgid ()); +} diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index ee2bf73469..be0417ca30 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -107,7 +107,7 @@ _dl_sysdep_start (void **start_argptr, else _dl_hurd_data = (void *) p; - _dl_secure = _dl_hurd_data->flags & EXEC_SECURE; + __libc_enable_secure = _dl_hurd_data->flags & EXEC_SECURE; if (_dl_hurd_data->flags & EXEC_STACK_ARGS && _dl_hurd_data->user_entry == 0) -- cgit 1.4.1