diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-01-15 06:46:12 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-01-19 09:55:47 -0800 |
| commit | 22b79ed7f413cd980a7af0cf258da5bf82b6d5e5 (patch) | |
| tree | c5310e68fb095169638722f93c477d9e7fcfa058 /sysdeps/unix/sysv | |
| parent | cabc8a291629011894ff5d1dc4ec7e25ecee6269 (diff) | |
| download | glibc-22b79ed7f413cd980a7af0cf258da5bf82b6d5e5.tar.gz glibc-22b79ed7f413cd980a7af0cf258da5bf82b6d5e5.tar.xz glibc-22b79ed7f413cd980a7af0cf258da5bf82b6d5e5.zip | |
Use <startup.h> in __libc_init_secure
Since __libc_init_secure is called before ARCH_SETUP_TLS, it must use "int $0x80" for system calls in i386 static PIE. Add startup_getuid, startup_geteuid, startup_getgid and startup_getegid to <startup.h>. Update __libc_init_secure to use them. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/startup.h | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/startup.h b/sysdeps/unix/sysv/linux/i386/startup.h index 3eb4cc43a2..dee7a4f1d3 100644 --- a/sysdeps/unix/sysv/linux/i386/startup.h +++ b/sysdeps/unix/sysv/linux/i386/startup.h @@ -17,11 +17,12 @@ <https://www.gnu.org/licenses/>. */ #if BUILD_PIE_DEFAULT -# include <abort-instr.h> - /* Can't use "call *%gs:SYSINFO_OFFSET" during statup in static PIE. */ # define I386_USE_SYSENTER 0 +# include <sysdep.h> +# include <abort-instr.h> + __attribute__ ((__noreturn__)) static inline void _startup_fatal (const char *message __attribute__ ((unused))) @@ -31,6 +32,30 @@ _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 |