Merge "Do not set PR_SET_NO_NEW_PRIVS when install seccomp filter"
diff --git a/libc/Android.bp b/libc/Android.bp
index 9da4e1d..3ff5c03 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -402,7 +402,6 @@
"upstream-openbsd/lib/libc/gen/getprogname.c",
"upstream-openbsd/lib/libc/gen/isctype.c",
"upstream-openbsd/lib/libc/gen/setprogname.c",
- "upstream-openbsd/lib/libc/gen/time.c",
"upstream-openbsd/lib/libc/gen/tolower_.c",
"upstream-openbsd/lib/libc/gen/toupper_.c",
"upstream-openbsd/lib/libc/gen/verr.c",
diff --git a/libc/bionic/vdso.cpp b/libc/bionic/vdso.cpp
index 44899e7..c926a58 100644
--- a/libc/bionic/vdso.cpp
+++ b/libc/bionic/vdso.cpp
@@ -61,12 +61,16 @@
}
time_t time(time_t* t) {
- auto vdso_time = reinterpret_cast<decltype(&time)>(
- __libc_globals->vdso[VDSO_TIME].fn);
+ auto vdso_time = reinterpret_cast<decltype(&time)>(__libc_globals->vdso[VDSO_TIME].fn);
if (__predict_true(vdso_time)) {
return vdso_time(t);
}
- return __time(t);
+
+ // We can't fallback to the time(2) system call because it doesn't exist for most architectures.
+ timeval tv;
+ if (gettimeofday(&tv, nullptr) == -1) return -1;
+ if (t) *t = tv.tv_sec;
+ return tv.tv_sec;
}
void __libc_init_vdso(libc_globals* globals, KernelArgumentBlock& args) {
diff --git a/libc/private/bionic_vdso.h b/libc/private/bionic_vdso.h
index 8c4d8d2..da19b29 100644
--- a/libc/private/bionic_vdso.h
+++ b/libc/private/bionic_vdso.h
@@ -46,7 +46,6 @@
extern "C" int __clock_gettime(int, timespec*);
extern "C" int __clock_getres(int, timespec*);
extern "C" int __gettimeofday(timeval*, struct timezone*);
-extern "C" time_t __time(time_t*);
struct vdso_entry {
const char* name;
diff --git a/libc/upstream-openbsd/lib/libc/gen/time.c b/libc/upstream-openbsd/lib/libc/gen/time.c
deleted file mode 100644
index afe463b..0000000
--- a/libc/upstream-openbsd/lib/libc/gen/time.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $OpenBSD: time.c,v 1.7 2015/10/29 03:58:55 mmcc Exp $ */
-/*
- * Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <time.h>
-
-__LIBC_HIDDEN__ time_t
-__time(time_t *t)
-{
- struct timeval tt;
-
- if (gettimeofday(&tt, NULL) < 0)
- return (-1);
- if (t)
- *t = (time_t)tt.tv_sec;
- return (tt.tv_sec);
-}
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 000d1f7..df580a6 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -1414,84 +1414,6 @@
// Bionic specific tests
#if defined(__BIONIC__)
-#if defined(__arm__)
-const llvm::ELF::Elf32_Dyn* to_dynamic_table(const char* p) {
- return reinterpret_cast<const llvm::ELF::Elf32_Dyn*>(p);
-}
-
-// Duplicate these definitions here because they are android specific
-// note that we cannot include <elf.h> because #defines conflict with
-// enum names provided by LLVM.
-#define DT_ANDROID_REL (llvm::ELF::DT_LOOS + 2)
-#define DT_ANDROID_RELA (llvm::ELF::DT_LOOS + 4)
-
-template<typename ELFT>
-void validate_compatibility_of_native_library(const std::string& path, ELFT* elf) {
- bool has_elf_hash = false;
- bool has_android_rel = false;
- bool has_rel = false;
- // Find dynamic section and check that DT_HASH and there is no DT_ANDROID_REL
- for (auto it = elf->section_begin(); it != elf->section_end(); ++it) {
- const llvm::object::ELFSectionRef& section_ref = *it;
- if (section_ref.getType() == llvm::ELF::SHT_DYNAMIC) {
- llvm::StringRef data;
- ASSERT_TRUE(!it->getContents(data)) << "unable to get SHT_DYNAMIC section data";
- for (auto d = to_dynamic_table(data.data()); d->d_tag != llvm::ELF::DT_NULL; ++d) {
- if (d->d_tag == llvm::ELF::DT_HASH) {
- has_elf_hash = true;
- } else if (d->d_tag == DT_ANDROID_REL || d->d_tag == DT_ANDROID_RELA) {
- has_android_rel = true;
- } else if (d->d_tag == llvm::ELF::DT_REL || d->d_tag == llvm::ELF::DT_RELA) {
- has_rel = true;
- }
- }
-
- break;
- }
- }
-
- ASSERT_TRUE(has_elf_hash) << path.c_str() << ": missing elf hash (DT_HASH)";
- ASSERT_TRUE(!has_android_rel) << path.c_str() << ": has packed relocations";
- ASSERT_TRUE(has_rel) << path.c_str() << ": missing DT_REL/DT_RELA";
-}
-
-void validate_compatibility_of_native_library(const char* soname) {
- // On the systems with emulation system libraries would be of different
- // architecture. Try to use alternate paths first.
- std::string path = std::string(ALTERNATE_PATH_TO_SYSTEM_LIB) + soname;
- auto binary_or_error = llvm::object::createBinary(path);
- if (!binary_or_error) {
- path = std::string(PATH_TO_SYSTEM_LIB) + soname;
- binary_or_error = llvm::object::createBinary(path);
- }
- ASSERT_FALSE(!binary_or_error);
-
- llvm::object::Binary* binary = binary_or_error.get().getBinary();
-
- auto obj = llvm::dyn_cast<llvm::object::ObjectFile>(binary);
- ASSERT_TRUE(obj != nullptr);
-
- auto elf = llvm::dyn_cast<llvm::object::ELF32LEObjectFile>(obj);
-
- ASSERT_TRUE(elf != nullptr);
-
- validate_compatibility_of_native_library(path, elf);
-}
-
-// This is a test for app compatibility workaround for arm apps
-// affected by http://b/24465209
-TEST(dlext, compat_elf_hash_and_relocation_tables) {
- validate_compatibility_of_native_library("libc.so");
- validate_compatibility_of_native_library("liblog.so");
- validate_compatibility_of_native_library("libstdc++.so");
- validate_compatibility_of_native_library("libdl.so");
- validate_compatibility_of_native_library("libm.so");
- validate_compatibility_of_native_library("libz.so");
- validate_compatibility_of_native_library("libjnigraphics.so");
-}
-
-#endif // defined(__arm__)
-
TEST(dlfcn, dlopen_invalid_rw_load_segment) {
const std::string libpath = get_testlib_root() +
"/" + kPrebuiltElfDir +