summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorhans <hans@chromium.org>2015-03-02 15:41:28 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-02 23:42:16 +0000
commitc647d34565a26b73452981f86556c5bb5ec438a6 (patch)
treef3eb9da2efbaed6764e9271ff0cbf01f344d0c93 /sandbox
parent67ab5f8cecc82d9b5594972413ab412b8d1fd55c (diff)
downloadchromium_src-c647d34565a26b73452981f86556c5bb5ec438a6.zip
chromium_src-c647d34565a26b73452981f86556c5bb5ec438a6.tar.gz
chromium_src-c647d34565a26b73452981f86556c5bb5ec438a6.tar.bz2
Roll Clang 223108:230914
Also introduce a build number in the package name, stop versioning the Blink GC plugin, and remove repackage.sh. BUG=444089 TBR=jln, jbauman NOPRESUBMIT=true Review URL: https://codereview.chromium.org/975503002 Cr-Commit-Position: refs/heads/master@{#318797}
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc
index 2d337c6..8e7e144 100644
--- a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc
+++ b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc
@@ -651,6 +651,10 @@ ResultExpr RedirectAllSyscallsPolicy::EvaluateSyscall(int sysno) const {
return UnsafeTrap(AllowRedirectedSyscall, NULL);
}
+#if !defined(ADDRESS_SANITIZER)
+// ASan does not allow changing the signal handler for SIGBUS, and treats it as
+// a fatal signal.
+
int bus_handler_fd_ = -1;
void SigBusHandler(int, siginfo_t* info, void* void_context) {
@@ -679,6 +683,7 @@ BPF_TEST_C(SandboxBPF, SigBus, RedirectAllSyscallsPolicy) {
BPF_ASSERT(close(fds[1]) == 0);
BPF_ASSERT(c == 0x55);
}
+#endif // !defined(ADDRESS_SANITIZER)
BPF_TEST_C(SandboxBPF, SigMask, RedirectAllSyscallsPolicy) {
// Signal masks are potentially tricky to handle. For instance, if we