diff options
| author | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 01:28:52 +0000 |
|---|---|---|
| committer | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 01:28:52 +0000 |
| commit | 1bf415567c28c5ea0cc3529f160496648ea162da (patch) | |
| tree | e30dc17291040b51935bff4ab5f25619f87fb7af /sandbox/linux/seccomp-bpf/sandbox_bpf.cc | |
| parent | 082261b9911da811ba57fa172dcad8677e716e35 (diff) | |
| download | chromium_src-1bf415567c28c5ea0cc3529f160496648ea162da.zip chromium_src-1bf415567c28c5ea0cc3529f160496648ea162da.tar.gz chromium_src-1bf415567c28c5ea0cc3529f160496648ea162da.tar.bz2 | |
Linux Sandbox: get everything to compile on Android.
We define our own android_arm_ucontext.h file since
signal.h doesn't define ucontext_t on Android.
BUG=166704
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11618010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/linux/seccomp-bpf/sandbox_bpf.cc')
| -rw-r--r-- | sandbox/linux/seccomp-bpf/sandbox_bpf.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sandbox/linux/seccomp-bpf/sandbox_bpf.cc b/sandbox/linux/seccomp-bpf/sandbox_bpf.cc index 740320f..366706f 100644 --- a/sandbox/linux/seccomp-bpf/sandbox_bpf.cc +++ b/sandbox/linux/seccomp-bpf/sandbox_bpf.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <signal.h> +#include <sys/prctl.h> +#include <sys/syscall.h> + #ifndef SECCOMP_BPF_STANDALONE #include "base/logging.h" #include "base/posix/eintr_wrapper.h" @@ -13,6 +17,11 @@ #include "sandbox/linux/seccomp-bpf/syscall_iterator.h" #include "sandbox/linux/seccomp-bpf/verifier.h" +// Android's signal.h doesn't define ucontext etc. +#if defined(OS_ANDROID) && defined(__arm__) +#include "sandbox/linux/services/android_arm_ucontext.h" +#endif + namespace { void WriteFailedStderrSetupMessage(int out_fd) { @@ -40,7 +49,8 @@ void WriteFailedStderrSetupMessage(int out_fd) { // way to mark a signal as allocated. So, the potential for collision is // possibly even worse. bool GetIsInSigHandler(const ucontext_t *ctx) { - return sigismember(&ctx->uc_sigmask, SIGBUS); + // Note: on Android, sigismember does not take a pointer to const. + return sigismember(const_cast<sigset_t*>(&ctx->uc_sigmask), SIGBUS); } void SetIsInSigHandler() { |