summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 06:31:53 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 06:31:53 +0000
commitf7fca3e9e6fb632d3c616a20d3094da4c0382ead (patch)
tree8217403880cc57941b164cfe957ffca21a4ab940 /content/common
parent6f5ad6c521a906624491f5a1bfc19c8d6df724d4 (diff)
downloadchromium_src-f7fca3e9e6fb632d3c616a20d3094da4c0382ead.zip
chromium_src-f7fca3e9e6fb632d3c616a20d3094da4c0382ead.tar.gz
chromium_src-f7fca3e9e6fb632d3c616a20d3094da4c0382ead.tar.bz2
Revert an occasional change of Trap to UnsafeTrap
BUG=127536 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11416336 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/sandbox_seccomp_bpf_linux.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/sandbox_seccomp_bpf_linux.cc b/content/common/sandbox_seccomp_bpf_linux.cc
index afd1e60..5491e8b 100644
--- a/content/common/sandbox_seccomp_bpf_linux.cc
+++ b/content/common/sandbox_seccomp_bpf_linux.cc
@@ -1227,10 +1227,10 @@ ErrorCode BaselinePolicy(int sysno) {
if (IsBaselinePolicyWatched(sysno)) {
// Previously unseen syscalls. TODO(jln): some of these should
// be denied gracefully right away.
- return Sandbox::UnsafeTrap(CrashSIGSYS_Handler, NULL);
+ return Sandbox::Trap(CrashSIGSYS_Handler, NULL);
}
// In any other case crash the program with our SIGSYS handler
- return Sandbox::UnsafeTrap(CrashSIGSYS_Handler, NULL);
+ return Sandbox::Trap(CrashSIGSYS_Handler, NULL);
}
// x86_64 only for now. Needs to be adapted and tested for i386/ARM.
@@ -1255,7 +1255,7 @@ ErrorCode GpuProcessPolicy_x86_64(int sysno, void *) {
// Hook open() in the GPU process to allow opening /etc/drirc,
// needed by Mesa.
// The hook needs dup(), lseek(), and close() to be allowed.
- return Sandbox::UnsafeTrap(GpuOpenSIGSYS_Handler, NULL);
+ return Sandbox::Trap(GpuOpenSIGSYS_Handler, NULL);
}
default:
if (IsEventFd(sysno))