From 6d9f5fc6ee46136163be16ec53cc70b4cba02c83 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Fri, 16 Jun 2023 16:47:21 -0700 Subject: Rename sysprop for MTE mode in system_server. Move the system property that controls MTE mode in system_server out of arm64.memtag.process namespace. Process sysprops affect the MTE mode of any process with the given name; using such property in a product means that any process or test unfortunately named "system_server" would be affected. Bug: 280343521 Test: debuggerd `pidof system_server` | head -30 | grep tagged_addr affected by the new property not affected by the old property Change-Id: I1b303803cd470808d493f8fa20a69e84b3906afc --- core/java/com/android/internal/os/ZygoteInit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index a95ce64ecec8..7f53cb433c98 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -771,7 +771,7 @@ public class ZygoteInit { Zygote.applyInvokeWithSystemProperty(parsedArgs); if (Zygote.nativeSupportsMemoryTagging()) { - String mode = SystemProperties.get("arm64.memtag.process.system_server", ""); + String mode = SystemProperties.get("persist.arm64.memtag.system_server", ""); if (mode.isEmpty()) { /* The system server has ASYNC MTE by default, in order to allow * system services to specify their own MTE level later, as you -- cgit v1.2.3-59-g8ed1b