RESTRICT AUTOMERGE Revert "Add policy for command line tool to control MTE boot state."
Revert submission 1959735
Reason for revert: b/220807329
Reverted Changes:
Idb5c4a4c6:Move mtectrl to private
I2e8419366:Add policy for command line tool to control MTE bo...
Change-Id: Ic679c2dab411f70bd26cf8da213c49473a243896
diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index dd8cc7f..0c36aed 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -86,7 +86,6 @@
memtrackproxy_service
mm_events_config_prop
music_recognition_service
- mtectrl
nfc_logs_data_file
odrefresh
odrefresh_exec
diff --git a/private/file_contexts b/private/file_contexts
index 6730c25..351cd7c 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -304,7 +304,6 @@
/system/bin/lpdumpd u:object_r:lpdumpd_exec:s0
/system/bin/rss_hwm_reset u:object_r:rss_hwm_reset_exec:s0
/system/bin/perfetto u:object_r:perfetto_exec:s0
-/system/bin/mtectrl u:object_r:mtectrl_exec:s0
/system/bin/traced u:object_r:traced_exec:s0
/system/bin/traced_perf u:object_r:traced_perf_exec:s0
/system/bin/traced_probes u:object_r:traced_probes_exec:s0
diff --git a/private/mtectrl.te b/private/mtectrl.te
deleted file mode 100644
index a89edda..0000000
--- a/private/mtectrl.te
+++ /dev/null
@@ -1,9 +0,0 @@
-# mtectrl is a tool to request MTE (Memory Tagging Extensions) from the bootloader.
-type mtectrl_exec, system_file_type, exec_type, file_type;
-
-init_daemon_domain(mtectrl)
-
-# mtectrl communicates the request to the bootloader via the misc partition.
-allow mtectrl misc_block_device:blk_file w_file_perms;
-allow mtectrl block_device:dir r_dir_perms;
-read_fstab(mtectrl)
diff --git a/public/domain.te b/public/domain.te
index 5c7c18c..799a2f1 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -627,7 +627,6 @@
-vold
-recovery
-ueventd
- -mtectrl
} misc_block_device:blk_file { append link relabelfrom rename write open read ioctl lock };
# Only (hw|vnd|)servicemanager should be able to register with binder as the context manager
diff --git a/public/mtectrl.te b/public/mtectrl.te
deleted file mode 100644
index 2fb8a96..0000000
--- a/public/mtectrl.te
+++ /dev/null
@@ -1 +0,0 @@
-type mtectrl, domain, coredomain;