diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 18 | ||||
| -rw-r--r-- | sysdeps/generic/sigaction.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/sigset.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/sys/ptrace.h | 4 |
4 files changed, 23 insertions, 7 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 546993dbd1..4d5faad69f 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -40,6 +40,7 @@ _dl_sysdep_start (void **start_argptr, Elf32_auxv_t *av; uid_t uid, euid; gid_t gid, egid; + unsigned int seen; user_entry = (Elf32_Addr) &_start; _dl_argc = *(int *) start_argptr; @@ -49,7 +50,12 @@ _dl_sysdep_start (void **start_argptr, while (*start_argptr) ++start_argptr; - for (av = (void *) ++start_argptr; av->a_type != AT_NULL; ++av) + seen = 0; +#define M(type) (1 << (type)) + + for (av = (void *) ++start_argptr; + av->a_type != AT_NULL; + seen |= M ((++av)->a_type)) switch (av->a_type) { case AT_PHDR: @@ -75,6 +81,16 @@ _dl_sysdep_start (void **start_argptr, break; } + /* Linux doesn't provide us with any of these values on the stack + when the dynamic linker is run directly as a program. */ + +#define SEE(UID, uid) if ((seen & M (AT_##UID)) == 0) uid = __get##uid () + SEE (UID, uid); + SEE (GID, gid); + SEE (EUID, euid); + SEE (EGID, egid); + + _dl_secure = uid != euid || gid != egid; #ifdef DL_SYSDEP_INIT diff --git a/sysdeps/generic/sigaction.h b/sysdeps/generic/sigaction.h index 31ce45c705..1676b1ce8e 100644 --- a/sysdeps/generic/sigaction.h +++ b/sysdeps/generic/sigaction.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 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 @@ -13,7 +13,7 @@ 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, 1992 Free Software Foundation, Inc., 675 Mass Ave, +not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* These definitions match those used by the 4.4 BSD kernel. diff --git a/sysdeps/generic/sigset.h b/sysdeps/generic/sigset.h index b3664e7876..e9dc7c728b 100644 --- a/sysdeps/generic/sigset.h +++ b/sysdeps/generic/sigset.h @@ -1,5 +1,5 @@ /* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version. -Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc. +Copyright (C) 1991, 1992, 1994, 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 @@ -14,7 +14,7 @@ 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, 1992 Free Software Foundation, Inc., 675 Mass Ave, +not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _SIGSET_H_types diff --git a/sysdeps/generic/sys/ptrace.h b/sysdeps/generic/sys/ptrace.h index a342e62d64..5fab97e51f 100644 --- a/sysdeps/generic/sys/ptrace.h +++ b/sysdeps/generic/sys/ptrace.h @@ -1,5 +1,5 @@ /* `ptrace' debugger support interface. Generic version; constants are common. -Copyright (C) 1991, 1992 Free Software Foundation, Inc. +Copyright (C) 1991, 1992, 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 @@ -14,7 +14,7 @@ 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, 1992 Free Software Foundation, Inc., 675 Mass Ave, +not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _PTRACE_H |