2019-12-16 12:58:32 +00:00
|
|
|
/* time -- Get number of seconds since Epoch. Linux version.
|
|
|
|
Copyright (C) 2020 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/>. */
|
|
|
|
|
|
|
|
/* Optimize the function call by setting the PLT directly to vDSO symbol. */
|
|
|
|
#ifdef USE_IFUNC_TIME
|
|
|
|
# include <time.h>
|
|
|
|
# include <sysdep.h>
|
|
|
|
# include <sysdep-vdso.h>
|
|
|
|
|
|
|
|
#ifdef SHARED
|
|
|
|
# include <dl-vdso.h>
|
elf: Move vDSO setup to rtld (BZ#24967)
This patch moves the vDSO setup from libc to loader code, just after
the vDSO link_map setup. For static case the initialization
is moved to _dl_non_dynamic_init instead.
Instead of using the mangled pointer, the vDSO data is set as
attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for
static). It is read-only even with partial relro.
It fixes BZ#24967 now that the vDSO pointer is setup earlier than
malloc interposition is called.
Also, vDSO calls should not be a problem for static dlopen as
indicated by BZ#20802. The vDSO pointer would be zero-initialized
and the syscall will be issued instead.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu,
powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and
sparcv9-linux-gnu. I also run some tests on mips.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
2019-11-29 13:44:59 +00:00
|
|
|
# include <libc-vdso.h>
|
2019-12-16 12:58:32 +00:00
|
|
|
|
|
|
|
static time_t
|
|
|
|
time_syscall (time_t *t)
|
|
|
|
{
|
|
|
|
return INLINE_SYSCALL_CALL (time, t);
|
|
|
|
}
|
|
|
|
|
|
|
|
# undef INIT_ARCH
|
|
|
|
# define INIT_ARCH() \
|
elf: Move vDSO setup to rtld (BZ#24967)
This patch moves the vDSO setup from libc to loader code, just after
the vDSO link_map setup. For static case the initialization
is moved to _dl_non_dynamic_init instead.
Instead of using the mangled pointer, the vDSO data is set as
attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for
static). It is read-only even with partial relro.
It fixes BZ#24967 now that the vDSO pointer is setup earlier than
malloc interposition is called.
Also, vDSO calls should not be a problem for static dlopen as
indicated by BZ#20802. The vDSO pointer would be zero-initialized
and the syscall will be issued instead.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu,
powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and
sparcv9-linux-gnu. I also run some tests on mips.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
2019-11-29 13:44:59 +00:00
|
|
|
void *vdso_time = dl_vdso_vsym (HAVE_TIME_VSYSCALL);
|
2019-12-16 12:58:32 +00:00
|
|
|
libc_ifunc (time,
|
|
|
|
vdso_time ? VDSO_IFUNC_RET (vdso_time)
|
|
|
|
: (void *) time_syscall);
|
|
|
|
|
|
|
|
# else
|
|
|
|
time_t
|
|
|
|
time (time_t *t)
|
|
|
|
{
|
|
|
|
return INLINE_VSYSCALL (time, 1, t);
|
|
|
|
}
|
|
|
|
# endif /* !SHARED */
|
|
|
|
#else /* USE_IFUNC_TIME */
|
2020-10-14 11:45:43 +00:00
|
|
|
# include <time.h>
|
|
|
|
# include <time-clockid.h>
|
|
|
|
# include <errno.h>
|
|
|
|
|
|
|
|
/* Return the time now, and store it in *TIMER if not NULL. */
|
|
|
|
|
|
|
|
__time64_t
|
|
|
|
__time64 (__time64_t *timer)
|
|
|
|
{
|
|
|
|
struct __timespec64 ts;
|
|
|
|
__clock_gettime64 (TIME_CLOCK_GETTIME_CLOCKID, &ts);
|
|
|
|
|
|
|
|
if (timer != NULL)
|
|
|
|
*timer = ts.tv_sec;
|
|
|
|
return ts.tv_sec;
|
|
|
|
}
|
|
|
|
|
|
|
|
# if __TIMESIZE != 64
|
|
|
|
libc_hidden_def (__time64)
|
|
|
|
|
|
|
|
time_t
|
|
|
|
__time (time_t *timer)
|
|
|
|
{
|
|
|
|
__time64_t t = __time64 (NULL);
|
|
|
|
|
|
|
|
if (! in_time_t_range (t))
|
|
|
|
{
|
|
|
|
__set_errno (EOVERFLOW);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (timer != NULL)
|
|
|
|
*timer = t;
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
weak_alias (__time, time)
|
2019-12-16 12:58:32 +00:00
|
|
|
#endif
|