diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-05 03:00:39 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-05 03:00:39 +0000 |
| commit | f07b0e0951c69eb5acac7c90ff8070c6f19e5daf (patch) | |
| tree | 0425e2528abca3f7f9af7b664013837d0dd37320 | |
| parent | 9d496e6c34fa8419f09260975f3d2cea69db4d50 (diff) | |
| parent | 35dbeecf0a15d2566dff2125da587ef458277bb9 (diff) | |
| download | bionic-f07b0e0951c69eb5acac7c90ff8070c6f19e5daf.tar.gz | |
Snap for 8543353 from 35dbeecf0a15d2566dff2125da587ef458277bb9 to tm-qpr1-release
Change-Id: I64830f76a65de48b9021f3bd6c7cae4729fe27f5
| -rw-r--r-- | libc/SECCOMP_ALLOWLIST_COMMON.TXT | 2 | ||||
| -rw-r--r-- | tests/gwp_asan_test.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libc/SECCOMP_ALLOWLIST_COMMON.TXT b/libc/SECCOMP_ALLOWLIST_COMMON.TXT index c440f9b74..0366fdf0f 100644 --- a/libc/SECCOMP_ALLOWLIST_COMMON.TXT +++ b/libc/SECCOMP_ALLOWLIST_COMMON.TXT @@ -31,6 +31,8 @@ int seccomp:seccomp(unsigned int operation, unsigned int flags, void *args) all int open:open(const char*, int, ...) arm,x86,x86_64 int stat64:stat64(const char*, struct stat64*) arm,x86 ssize_t readlink:readlink(const char*, char*, size_t) arm,x86,x86_64 +# Needed by ubsan in T? (http://b/229989971) +int stat(const char*, struct stat*) arm,x86,x86_64 # # Useful new syscalls which we don't yet use in bionic. diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp index b442f51e6..b2c7780b1 100644 --- a/tests/gwp_asan_test.cpp +++ b/tests/gwp_asan_test.cpp @@ -43,7 +43,7 @@ void RunGwpAsanTest(const char* test_name) { std::string filter_arg = "--gtest_filter="; filter_arg += test_name; std::string exec(testing::internal::GetArgvs()[0]); - eh.SetArgs({exec.c_str(), "--gtest_also_run_disabled_tests", filter_arg.c_str()}); + eh.SetArgs({exec.c_str(), "--gtest_also_run_disabled_tests", filter_arg.c_str(), nullptr}); eh.Run([&]() { execve(exec.c_str(), eh.GetArgs(), eh.GetEnv()); }, /* expected_exit_status */ 0, // |expected_output_regex|, ensure at least one test ran: |