commit 2bb1dba5c7a3a27d03f83eea5529923c4d517bd2
author Evgenii Stepanov <eugenis@google.com> Fri Mar 06 15:56:59 2020 -0800
committer Evgenii Stepanov <eugenis@google.com> Fri Mar 06 17:00:34 2020 -0800
tree a5af5fb7b5d063b0dbacfc56932412469b534197
parent 88758aead73a54840470c1affe507c1d7b73dc20

Enable gwp-asan in system_server.

Enables gwp-asan in system_server with a small probability, same as any
native process or system app.

Bug: 149991821
Test: kill system_server in a loop - find "GWP" in /proc/$PID/maps
      eventually
Change-Id: I3900f5d277d28987883a918d62fe9390c780ac30

core/java/com/android/internal/os/ZygoteInit.java

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index de51f8c..033632f 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -787,6 +787,10 @@
              * this is present in all ARMv8 CPUs; this flag has no effect on other platforms. */
             parsedArgs.mRuntimeFlags |= Zygote.MEMORY_TAG_LEVEL_TBI;
 
+            /* Enable gwp-asan on the system server with a small probability. This is the same
+             * policy as applied to native processes and system apps. */
+            parsedArgs.mRuntimeFlags |= Zygote.GWP_ASAN_LEVEL_LOTTERY;
+
             if (shouldProfileSystemServer()) {
                 parsedArgs.mRuntimeFlags |= Zygote.PROFILE_SYSTEM_SERVER;
             }