c2879fd933
* Thu Jan 13 2022 Florian Weimer <fweimer@redhat.com> - 2.34-18 - Backport optimized ELF dependency sorting algorithm (#2032647) * Thu Jan 13 2022 Florian Weimer <fweimer@redhat.com> - 2.34-17 - Sync with upstream branch release/2.34/master, commit 2fe2af88abd13ae5636881da2e26f461ecb7dfb5 - i386: Remove broken CAN_USE_REGISTER_ASM_EBP (bug 28771) - Update syscall lists for Linux 5.15 - powerpc: Fix unrecognized instruction errors with recent GCC - timezone: test-case for BZ #28707 - timezone: handle truncated timezones from tzcode-2021d and later (BZ #28707) - Fix subscript error with odd TZif file [BZ #28338] - AArch64: Check for SVE in ifuncs [BZ #28744] - intl/plural.y: Avoid conflicting declarations of yyerror and yylex - Linux: Fix 32-bit vDSO for clock_gettime on powerpc32 - linux: Add sparck brk implementation - Update sparc libm-test-ulps - Update hppa libm-test-ulps - riscv: align stack before calling _dl_init [BZ #28703] - riscv: align stack in clone [BZ #28702] - powerpc64[le]: Allocate extra stack frame on syscall.S - elf: Fix tst-cpu-features-cpuinfo for KVM guests on some AMD systems [BZ #28704] - nss: Use "files dns" as the default for the hosts database (bug 28700) - arm: Guard ucontext _rtld_global_ro access by SHARED, not PIC macro - mips: increase stack alignment in clone to match the ABI - mips: align stack in clone [BZ #28223] Resolves: #2032647 Resolves: #2033649
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
commit 8ad6d6d8ed33631bd2ca5d1112e6da2f92731432
|
|
Author: maminjie <maminjie2@huawei.com>
|
|
Date: Mon Dec 20 19:36:32 2021 +0800
|
|
|
|
Linux: Fix 32-bit vDSO for clock_gettime on powerpc32
|
|
|
|
When the clock_id is CLOCK_PROCESS_CPUTIME_ID or CLOCK_THREAD_CPUTIME_ID,
|
|
on the 5.10 kernel powerpc 32-bit, the 32-bit vDSO is executed successfully (
|
|
because the __kernel_clock_gettime in arch/powerpc/kernel/vdso32/gettimeofday.S
|
|
does not support these two IDs, the 32-bit time_t syscall will be used),
|
|
but tp32.tv_sec is equal to 0, causing the 64-bit time_t syscall to continue to be used,
|
|
resulting in two system calls.
|
|
|
|
Fix commit 72e84d1db22203e01a43268de71ea8669eca2863.
|
|
|
|
Signed-off-by: maminjie <maminjie2@huawei.com>
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
|
(cherry picked from commit e0fc721ce600038dd390e77cfe52440707ef574d)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
|
|
index 91df6b3d967bf945..9c7d9073254843c7 100644
|
|
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
|
|
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
|
|
@@ -53,7 +53,7 @@ __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
|
|
{
|
|
struct timespec tp32;
|
|
r = INTERNAL_VSYSCALL_CALL (vdso_time, 2, clock_id, &tp32);
|
|
- if (r == 0 && tp32.tv_sec > 0)
|
|
+ if (r == 0 && tp32.tv_sec >= 0)
|
|
{
|
|
*tp = valid_timespec_to_timespec64 (tp32);
|
|
return 0;
|