From 0a2d61505a26e4ce0ae6a12d32ba383a85a239e2 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Wed, 1 Feb 2017 13:19:56 -0800 Subject: [PATCH] Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set." This reverts commit 59972218f8c0d397fc50400a2b8b9be92ceeaf93. Bug: http://b/34853272 Test: debuggerd -b `pidof system_server` Change-Id: I440932210b6e84647c2848bab2e082a58338fb1e --- core/jni/com_android_internal_os_Zygote.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 516ab38080793..a32dbad7838ff 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -247,11 +247,6 @@ static void EnableKeepCapabilities(JNIEnv* env) { static void DropCapabilitiesBoundingSet(JNIEnv* env) { for (int i = 0; prctl(PR_CAPBSET_READ, i, 0, 0, 0) >= 0; i++) { - // Keep CAP_SYS_PTRACE in our bounding set so crash_dump can gain it. - if (i == CAP_SYS_PTRACE) { - continue; - } - int rc = prctl(PR_CAPBSET_DROP, i, 0, 0, 0); if (rc == -1) { if (errno == EINVAL) {