commit 84a30c8526b5b4f9dc21f3aa0ac5640a4899e11d
author Florian Mayer <fmayer@google.com> Mon Oct 03 17:47:12 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 03 17:47:12 2022 +0000
tree 0d26788c9fc74aa73b81f7504014adc60db502d2
parent f2065c889065aaca4d63dcd0d29d88512b5f9455
parent caa7a60e2d2bd881c7c03131e59052d47a88240a

Merge "[MTE] Add device config to control upgrade time"

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 8334732..a633048 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -340,9 +340,18 @@
                               siginfo.si_status == BIONIC_SIGNAL_ART_PROFILER && !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