From eeff2cf7531f06816c168131f641f98b5fcbea81 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Fri, 6 Mar 2020 15:56:59 -0800 Subject: [PATCH] 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 (cherry picked from commit 2bb1dba5c7a3a27d03f83eea5529923c4d517bd2) --- core/java/com/android/internal/os/ZygoteInit.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 0bfd65936b4ae..ec1f516df5f32 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -761,6 +761,10 @@ public class ZygoteInit { * 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; }