commit 798edd5f41b231e89350c3b4b5408b552b4e2bd6
author Florian Mayer <fmayer@google.com> Tue Aug 02 01:26:41 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 02 01:26:41 2022 +0000
tree 12d4f0a91f28099db5d9adc30ea7eb8159a4b3a8
parent a5ac95cef3422919d4b29ea33db2757f4896fa5a
parent 5d962b5728b9be2d8a6398a5212b0d31b1574fc0

Merge "[MTE] Support device_config override in mtectrl." am: 5d962b5728

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2167579

Change-Id: Idd61fdb88906d23ead1fb2c4c11dda7a5d9c6d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

mtectrl/mtectrl.cc

diff --git a/mtectrl/mtectrl.cc b/mtectrl/mtectrl.cc
index 118c71c..eefc158 100644
--- a/mtectrl/mtectrl.cc
+++ b/mtectrl/mtectrl.cc
@@ -21,15 +21,16 @@
 #include <iostream>
 
 int main(int argc, char** argv) {
-  if (argc != 2) {
-    std::cerr
-        << "Usage: " << argv[0]
-        << " none|memtag|memtag-once|memtag-kernel|memtag-kernel-once[,...]\n";
-    return 1;
-  }
+    if (argc != 2 && argc != 3) {
+        std::cerr << "Usage: " << argv[0]
+                  << " none|memtag|memtag-once|memtag-kernel|memtag-kernel-once[,.."
+                     ".] [default|force_on|force_off]\n";
+        return 1;
+    }
   std::string value = argv[1];
   misc_memtag_message m = {.version = MISC_MEMTAG_MESSAGE_VERSION,
                            .magic = MISC_MEMTAG_MAGIC_HEADER};
+  bool valid_value = true;
   for (const auto& field : android::base::Split(value, ",")) {
     if (field == "memtag") {
       m.memtag_mode |= MISC_MEMTAG_MODE_MEMTAG;
@@ -42,17 +43,48 @@
     } else if (field == "memtag-off") {
       m.memtag_mode |= MISC_MEMTAG_MODE_MEMTAG_OFF;
     } else if (field != "none") {
-      LOG(ERROR) << "Unknown value for arm64.memtag.bootctl: " << field;
-      return 1;
+      LOG(ERROR) << "Unknown value for mode: " << field;
+      valid_value = false;
+      m = {.version = MISC_MEMTAG_MESSAGE_VERSION, .magic = MISC_MEMTAG_MAGIC_HEADER};
+      break;
     }
   }
+  bool valid_override = true;
+  std::string override_value;
+  if (argc == 3) {
+    override_value = argv[2];
+  }
+  if (override_value == "force_off") {
+    // If the force_off override is active, only allow MEMTAG_MODE_MEMTAG_ONCE.
+    m.memtag_mode |= MISC_MEMTAG_MODE_MEMTAG_OFF;
+    m.memtag_mode &= ~MISC_MEMTAG_MODE_MEMTAG;
+  } else if (override_value == "force_on") {
+    m.memtag_mode |= MISC_MEMTAG_MODE_MEMTAG;
+    m.memtag_mode &= ~MISC_MEMTAG_MODE_MEMTAG_OFF;
+  } else if (!override_value.empty() && override_value != "default") {
+    LOG(ERROR) << "Unknown value for override: " << override_value;
+    valid_override = false;
+  }
+  if (!valid_value && !valid_override) {
+    return 1;
+  }
   std::string err;
   if (!WriteMiscMemtagMessage(m, &err)) {
-    LOG(ERROR) << "Failed to apply arm64.memtag.bootctl: " << value << ". "
-               << err;
+    LOG(ERROR) << "Failed to apply mode: " << value << ", override: " << override_value << err;
     return 1;
   } else {
-    LOG(INFO) << "Applied arm64.memtag.bootctl: " << value;
-    return 0;
+    const char* parse_error = "";
+    const char* verb = "Applied";
+    if (!valid_value) {
+      parse_error = " (invalid mode)";
+      verb = "Partially applied";
+    } else if (!valid_override) {
+      // else if because we bail out if both are false above.
+      parse_error = " (invalid override)";
+      verb = "Partially applied";
+    }
+    LOG(INFO) << verb << " mode: " << value << ", "
+              << "override: " << override_value << parse_error;
+    return !valid_value || !valid_override;
   }
 }

mtectrl/mtectrl.rc

diff --git a/mtectrl/mtectrl.rc b/mtectrl/mtectrl.rc
index de04237..05bdaa2 100644
--- a/mtectrl/mtectrl.rc
+++ b/mtectrl/mtectrl.rc
@@ -13,4 +13,7 @@
 # limitations under the License.
 
 on property:arm64.memtag.bootctl=*
-  exec -- /system/bin/mtectrl ${arm64.memtag.bootctl}
+  exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native.bootloader_override:-default}
+
+on property:persist.device_config.memory_safety_native.bootloader_override=*
+  exec -- /system/bin/mtectrl ${arm64.memtag.bootctl:-none} ${persist.device_config.memory_safety_native.bootloader_override:-default}