summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorsgurun <sgurun@chromium.org>2016-02-05 16:52:08 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-06 00:53:40 +0000
commitd8166bd9a4c900c9a8079c9e7b4d3e750b497f51 (patch)
tree58911aa657808e7a4ac4087cebe65739dcf02e32 /sandbox
parent13f285d4687f9e39204a3d7e0743da52d7ab6f1c (diff)
downloadchromium_src-d8166bd9a4c900c9a8079c9e7b4d3e750b497f51.zip
chromium_src-d8166bd9a4c900c9a8079c9e7b4d3e750b497f51.tar.gz
chromium_src-d8166bd9a4c900c9a8079c9e7b4d3e750b497f51.tar.bz2
Revert of [Android] Fix Microdump generation when Seccomp-BPF is enabled. (patchset #3 id:40001 of https://codereview.chromium.org/1669043003/ )
Reason for revert: broke android x86 builder. Bug: 584857 Original issue's description: > [Android] Fix Microdump generation when Seccomp-BPF is enabled. > > BUG=584518,439573 > > Committed: https://crrev.com/4fe32a5a3c3c5db910517f70f45ea03ee1c676ed > Cr-Commit-Position: refs/heads/master@{#373934} TBR=mdempsky@chromium.org,rsesek@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=584518,439573 Review URL: https://codereview.chromium.org/1671333003 Cr-Commit-Position: refs/heads/master@{#373978}
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
index 57bffc0..4b98366 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -52,10 +52,6 @@
#define PR_SET_TIMERSLACK_PID 41
#endif
-#ifndef PR_SET_PTRACER
-#define PR_SET_PTRACER 0x59616d61
-#endif
-
#endif // defined(OS_ANDROID)
#if defined(__arm__) && !defined(MAP_STACK)
@@ -147,7 +143,7 @@ ResultExpr RestrictPrctl() {
.CASES((PR_GET_NAME, PR_SET_NAME, PR_GET_DUMPABLE, PR_SET_DUMPABLE
#if defined(OS_ANDROID)
,
- PR_SET_VMA, PR_SET_TIMERSLACK_PID, PR_SET_PTRACER
+ PR_SET_VMA, PR_SET_TIMERSLACK_PID
#endif
),
Allow())