From 8895ef1256411a4eda96aa4aa6dd4c9147118737 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Fri, 3 Dec 2021 17:06:46 -0800 Subject: [PATCH] Pass MTE RuntimeFlags to AppZygote. Fix AppZygote process and its children (the actual service processes) ignoring android:memtagMode attribute in the app manifest. When starting a new AppZygote process, apply memtag-related flags as determined by the app manifest (and modified by compat features and actual h/w capabilities). If this is not done, MTE is always disabled in an AppZygote process, which makes it impossible to enable it in the AppZygote's children. This change has no effect unless MTE is supported in the hardware (ARMv9) and enabled in the system. Bug: 207557677 Test: CtsTaggingHostTestCases Change-Id: I8805958545fd790e4ca857184b749a21e58d68cd --- core/java/android/os/AppZygote.java | 8 ++++++-- services/core/java/com/android/server/am/ProcessList.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java index 74b814ea4159d..c8b4226ecae0f 100644 --- a/core/java/android/os/AppZygote.java +++ b/core/java/android/os/AppZygote.java @@ -45,6 +45,8 @@ public class AppZygote { // Last UID/GID of the range the AppZygote can setuid()/setgid() to private final int mZygoteUidGidMax; + private final int mZygoteRuntimeFlags; + private final Object mLock = new Object(); /** @@ -56,11 +58,13 @@ public class AppZygote { private final ApplicationInfo mAppInfo; - public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax) { + public AppZygote(ApplicationInfo appInfo, int zygoteUid, int uidGidMin, int uidGidMax, + int runtimeFlags) { mAppInfo = appInfo; mZygoteUid = zygoteUid; mZygoteUidGidMin = uidGidMin; mZygoteUidGidMax = uidGidMax; + mZygoteRuntimeFlags = runtimeFlags; } /** @@ -110,7 +114,7 @@ public class AppZygote { mZygoteUid, mZygoteUid, null, // gids - 0, // runtimeFlags + mZygoteRuntimeFlags, // runtimeFlags "app_zygote", // seInfo abi, // abi abi, // acceptedAbiList diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index b77270f5963bb..f35afa5b7ca0f 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -2238,7 +2238,8 @@ public final class ProcessList { // not the calling one. appInfo.packageName = app.getHostingRecord().getDefiningPackageName(); appInfo.uid = uid; - appZygote = new AppZygote(appInfo, uid, firstUid, lastUid); + int runtimeFlags = decideTaggingLevel(app); + appZygote = new AppZygote(appInfo, uid, firstUid, lastUid, runtimeFlags); mAppZygotes.put(app.info.processName, uid, appZygote); zygoteProcessList = new ArrayList(); mAppZygoteProcesses.put(appZygote, zygoteProcessList);