From 6ebd0711a418be63dce59850c897a13f4f722c27 Mon Sep 17 00:00:00 2001 From: Donnie Pollitz Date: Thu, 16 Nov 2023 15:16:31 +0100 Subject: [PATCH] Fix SELinux permissions for trusty_userdata partition Bug: 301677815 Test: Trusty storage port tests passing Change-Id: Ibbcbd4523e31a3c79035fe16bc1bec3ed60205fa Signed-off-by: Donnie Pollitz --- legacy/zuma/vendor/device.te | 1 - legacy/zuma/vendor/file_contexts | 1 - vendor/file_contexts | 4 ++++ vendor/tee.te | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 vendor/tee.te diff --git a/legacy/zuma/vendor/device.te b/legacy/zuma/vendor/device.te index 044da91..714896d 100644 --- a/legacy/zuma/vendor/device.te +++ b/legacy/zuma/vendor/device.te @@ -1,5 +1,4 @@ type persist_block_device, dev_type; -type tee_persist_block_device, dev_type; type custom_ab_block_device, dev_type; type devinfo_block_device, dev_type; type mfg_data_block_device, dev_type; diff --git a/legacy/zuma/vendor/file_contexts b/legacy/zuma/vendor/file_contexts index 7980516..8cac3ea 100644 --- a/legacy/zuma/vendor/file_contexts +++ b/legacy/zuma/vendor/file_contexts @@ -73,7 +73,6 @@ /dev/block/platform/13200000\.ufs/by-name/pvmfw_[ab] u:object_r:custom_ab_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/super u:object_r:super_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/tzsw_[ab] u:object_r:custom_ab_block_device:s0 -/dev/block/platform/13200000\.ufs/by-name/trusty_persist u:object_r:tee_persist_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/userdata u:object_r:userdata_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/vbmeta_[ab] u:object_r:custom_ab_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/vbmeta_system_[ab] u:object_r:custom_ab_block_device:s0 diff --git a/vendor/file_contexts b/vendor/file_contexts index eafa72d..17931aa 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -26,3 +26,7 @@ # Gralloc /(vendor|system/vendor)/lib(64)?/hw/mapper\.pixel\.so u:object_r:same_process_hal_file:s0 + +# Trusty +/dev/block/platform/13200000\.ufs/by-name/trusty_persist u:object_r:tee_persist_block_device:s0 +/dev/block/platform/13200000\.ufs/by-name/trusty_userdata u:object_r:tee_userdata_block_device:s0 diff --git a/vendor/tee.te b/vendor/tee.te new file mode 100644 index 0000000..9fd01ec --- /dev/null +++ b/vendor/tee.te @@ -0,0 +1,2 @@ +type tee_persist_block_device, dev_type; +type tee_userdata_block_device, dev_type;