netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2008 from lubinszARM:pr_skip_vsyscall

Browse Source 
PiperOrigin-RevId: 298683693
This commit is contained in:
gVisor bot
2020-03-03 13:48:00 -08:00
parent 3aa97c893d dd1ed5c789
commit ba8b8154e8
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/syscalls/linux/time.cc
+2
View File
@@ -26,6 +26,7 @@ namespace {
constexpr long kFudgeSeconds = 5;
#if defined(__x86_64__) || defined(__i386__)
// Mimics the time(2) wrapper from glibc prior to 2.15.
time_t vsyscall_time(time_t* t) {
constexpr uint64_t kVsyscallTimeEntry = 0xffffffffff600400;
@@ -98,6 +99,7 @@ TEST(TimeTest, VsyscallGettimeofday_InvalidAddressSIGSEGV) {
reinterpret_cast<struct timezone*>(0x1)),
::testing::KilledBySignal(SIGSEGV), "");
}
#endif
} // namespace
test/syscalls/linux/vsyscall.cc
+2
View File
@@ -24,6 +24,7 @@ namespace testing {
namespace {
#if defined(__x86_64__) || defined(__i386__)
time_t vsyscall_time(time_t* t) {
constexpr uint64_t kVsyscallTimeEntry = 0xffffffffff600400;
return reinterpret_cast<time_t (*)(time_t*)>(kVsyscallTimeEntry)(t);
@@ -37,6 +38,7 @@ TEST(VsyscallTest, VsyscallAlwaysAvailableOnGvisor) {
time_t t;
EXPECT_THAT(vsyscall_time(&t), SyscallSucceeds());
}
#endif
} // namespace