Commit 74996623 authored by Yi Fan's avatar Yi Fan Committed by Commit Bot

workaround sandbox_linux_unittests test failure

clock_gettime() doesn't call syscall SYS_clock_gettime when VDSO is enabled.
some unittests would fail.

This is happening on aarch64 kernel w/ CL
"arm64: Add support for CLOCK_MONOTONIC_RAW in clock_gettime() vDSO".

enforce to use syscall to SYS_clock_gettime to get around the failure

Bug: internal b/110172084
Test: local test
Cq-Include-Trybots: master.tryserver.chromium.android:android_compile_x64_dbg;master.tryserver.chromium.android:android_compile_x86_dbg
Change-Id: Idc824403faaba7b8504bf89ba10f0ba50422c3f5
Reviewed-on: https://chromium-review.googlesource.com/1187586
Commit-Queue: Yi Fan <yfa@chromium.org>
Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Reviewed-by: default avatarJorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585885}
parent 6c26f334
...@@ -361,7 +361,7 @@ BPF_DEATH_TEST_C(BaselinePolicy, ...@@ -361,7 +361,7 @@ BPF_DEATH_TEST_C(BaselinePolicy,
DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()), DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()),
BaselinePolicy) { BaselinePolicy) {
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC_RAW, &ts); syscall(SYS_clock_gettime, CLOCK_MONOTONIC_RAW, &ts);
} }
#if !defined(GRND_RANDOM) #if !defined(GRND_RANDOM)
......
...@@ -98,7 +98,7 @@ BPF_DEATH_TEST_C(ParameterRestrictions, ...@@ -98,7 +98,7 @@ BPF_DEATH_TEST_C(ParameterRestrictions,
DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()), DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()),
RestrictClockIdPolicy) { RestrictClockIdPolicy) {
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC_RAW, &ts); syscall(SYS_clock_gettime, CLOCK_MONOTONIC_RAW, &ts);
} }
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment