diff options
| author | Florian Mayer <fmayer@google.com> | 2022-06-22 18:39:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-22 18:39:37 +0000 |
| commit | e594e54e6a0a961a3c03120d980aed18f3b6908c (patch) | |
| tree | 04575e5fc2711029f08b8f97ea6af06eff7ebd01 | |
| parent | 1e5e65e4ebb6d917f85f48fff1afd811f93993f0 (diff) | |
| parent | b29247186b6e03301974cc8da4950e486ee785a2 (diff) | |
| download | extras-e594e54e6a0a961a3c03120d980aed18f3b6908c.tar.gz | |
Merge "Allow to turn off MTE from userspace." am: e5f8cda1df am: b29247186b
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2124401
Change-Id: Idcd09215a3d13d19a1ecf6ca9ed44094f6705c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | mtectrl/mtectrl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mtectrl/mtectrl.cc b/mtectrl/mtectrl.cc index 4e722407..118c71c7 100644 --- a/mtectrl/mtectrl.cc +++ b/mtectrl/mtectrl.cc @@ -39,6 +39,8 @@ int main(int argc, char** argv) { m.memtag_mode |= MISC_MEMTAG_MODE_MEMTAG_KERNEL; } else if (field == "memtag-kernel-once") { m.memtag_mode |= MISC_MEMTAG_MODE_MEMTAG_KERNEL_ONCE; + } 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; |