summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mitch Phillips <mitchp@google.com> 2020-02-26 09:53:34 -0800
committer Mitch Phillips <mitchp@google.com> 2020-02-26 19:25:11 +0000
commit9300488ba6d1d2a72c3badcb0ca2b64c515afe41 (patch)
tree2cd88d73f4e4c65faea38981885a35d052d62234
parent214fe98184dc088af3e1fa23699af8a6ef79312b (diff)
[GWP-ASan] Disable for apps.
Disable GWP-ASan for all applications by default. Long-term R-release goals are that GWP-ASan is: 1. Enabled by default for the system. 2. Enabled by default for system apps. 3. Disabled by default (with manifest opt-in) for user apps. At DP2 cut point, we were enabled by default for the system, system apps, and user apps. We were intending to downgrade user apps to be disabled-by-default with the manifest changes in ag/10329607, but we didn't manage to get that through by DP2 cut. Because we want GWP-ASan to be less aggressive on user apps, it's safest to just disable GWP-ASan for all apps. Bug: 135634846 Test: Build and verify no GWP-ASan for apps. Change-Id: If92cafb49b1484d173a4eadb377d18b29d217cd4
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index e4141e02ab1c..359fd48ade36 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -626,12 +626,6 @@ static void PreApplicationInit() {
// Set the jemalloc decay time to 1.
mallopt(M_DECAY_TIME, 1);
-
- // Maybe initialize GWP-ASan here. Must be called after
- // mallopt(M_SET_ZYGOTE_CHILD).
- bool ForceEnableGwpAsan = false;
- android_mallopt(M_INITIALIZE_GWP_ASAN, &ForceEnableGwpAsan,
- sizeof(ForceEnableGwpAsan));
}
static void SetUpSeccompFilter(uid_t uid, bool is_child_zygote) {