commit caa7a60e2d2bd881c7c03131e59052d47a88240a
author Florian Mayer <fmayer@google.com> Thu Sep 15 18:10:54 2022 -0700
committer Florian Mayer <fmayer@google.com> Fri Sep 16 09:49:38 2022 -0700
tree a5c6e12052f25bd3726120d433e4fec4dbf730c9
parent 61c82abe24ae265e41b1176077696814dceef137

[MTE] Add device config to control upgrade time

Bug: 169277947
Change-Id: I67eb94a668e60a2970bb086f82cc69396275340a

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 4cf409c..054ae49 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -331,9 +331,18 @@
                               !upgraded_mte_;
 
     if (should_upgrade_mte) {
-        LOG(INFO) << "Upgrading service " << name_ << " to sync MTE";
-        once_environment_vars_.emplace_back("BIONIC_MEMTAG_UPGRADE_SECS", "60");
-        upgraded_mte_ = true;
+        constexpr int kDefaultUpgradeSecs = 60;
+        int secs = GetIntProperty("persist.device_config.memory_safety_native.upgrade_secs.default",
+                                  kDefaultUpgradeSecs);
+        secs = GetIntProperty(
+                "persist.device_config.memory_safety_native.upgrade_secs.service." + name_, secs);
+        if (secs > 0) {
+            LOG(INFO) << "Upgrading service " << name_ << " to sync MTE for " << secs << " seconds";
+            once_environment_vars_.emplace_back("BIONIC_MEMTAG_UPGRADE_SECS", std::to_string(secs));
+            upgraded_mte_ = true;
+        } else {
+            LOG(INFO) << "Not upgrading service " << name_ << " to sync MTE due to device config";
+        }
     }
 #endif