From 6cfb2d5778c031f64bdaf7b35129d3e02e9c88c9 Mon Sep 17 00:00:00 2001 From: SamarV-121 Date: Thu, 15 Jul 2021 22:49:18 +0530 Subject: [PATCH] universal7885: sepolicy: Remove mobicore and trustonic HAL rules from here * Moved to common slsi sepolicy Signed-off-by: SamarV-121 Change-Id: I204b0eaad014f97166180b17678277c48a851491 --- sepolicy/vendor/attributes | 6 ------ sepolicy/vendor/device.te | 2 -- sepolicy/vendor/file_contexts | 6 ------ sepolicy/vendor/hal_fingerprint_default.te | 2 -- sepolicy/vendor/hal_gatekeeper_default.te | 2 -- sepolicy/vendor/hal_keymaster_default.te | 2 -- sepolicy/vendor/hal_tee_default.te | 17 ----------------- sepolicy/vendor/hal_teeregistry_default.te | 21 --------------------- sepolicy/vendor/hwservice.te | 3 --- sepolicy/vendor/hwservice_contexts | 4 ---- sepolicy/vendor/system_server.te | 1 - sepolicy/vendor/tee.te | 5 ----- 12 files changed, 71 deletions(-) delete mode 100644 sepolicy/vendor/attributes delete mode 100644 sepolicy/vendor/hal_keymaster_default.te delete mode 100644 sepolicy/vendor/hal_tee_default.te delete mode 100644 sepolicy/vendor/hal_teeregistry_default.te diff --git a/sepolicy/vendor/attributes b/sepolicy/vendor/attributes deleted file mode 100644 index b19b41e..0000000 --- a/sepolicy/vendor/attributes +++ /dev/null @@ -1,6 +0,0 @@ -attribute hal_tee_client; -attribute hal_tee_server; -attribute hal_tee; -attribute hal_teeregistry_client; -attribute hal_teeregistry_server; -attribute hal_teeregistry; diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te index a9b6694..e7fb8fa 100644 --- a/sepolicy/vendor/device.te +++ b/sepolicy/vendor/device.te @@ -12,5 +12,3 @@ type m2m1shot_device, dev_type; # gps type gps_device, dev_type; - -type mobicore_vendor_file, dev_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 696ffec..b1acc26 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -65,7 +65,6 @@ # mobicore /data/misc/mcRegistry(/.*)? u:object_r:mobicore_data_file:s0 -/data/vendor/mcRegistry(/.*)? u:object_r:mobicore_vendor_data_file:s0 # camera /data/camera(/.*)? u:object_r:camera_data_file:s0 @@ -126,9 +125,6 @@ /(vendor|system/vendor)/lib(64)?/libion_exynos\.so u:object_r:same_process_hal_file:s0 /(vendor|system/vendor)/lib(64)?/vulkan\.[a-z0-9]*\.so u:object_r:same_process_hal_file:s0 - -/(vendor|system\/vendor)/app/mcRegistry(/.*)? u:object_r:mobicore_vendor_file:s0 - /(vendor|system/vendor)/bin/main_abox u:object_r:abox_exec:s0 /(vendor|system/vendor)/bin/wlbtd u:object_r:wlbtd_exec:s0 /(vendor|system/vendor)/bin/hw/gpsd u:object_r:gpsd_exec:s0 @@ -143,5 +139,3 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.basic u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@[0-9]\.[0-9]-service.samsung u:object_r:hal_nfc_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.trustonic\.tee@[0-9]\.[0-9]-service u:object_r:hal_tee_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.trustonic\.teeregistry@[0-9]\.[0-9]-service u:object_r:hal_teeregistry_default_exec:s0 diff --git a/sepolicy/vendor/hal_fingerprint_default.te b/sepolicy/vendor/hal_fingerprint_default.te index a5fa396..3f0b690 100644 --- a/sepolicy/vendor/hal_fingerprint_default.te +++ b/sepolicy/vendor/hal_fingerprint_default.te @@ -4,5 +4,3 @@ allow hal_fingerprint_default fingerprintd_data_file:dir write; allow hal_fingerprint_default fingerprint_device:chr_file rw_file_perms; allow hal_fingerprint_default sysfs_virtual:dir search; allow hal_fingerprint_default sysfs_virtual:file r_file_perms; -allow hal_fingerprint_default mobicore_vendor_file:file r_file_perms; -allow hal_fingerprint_default mobicore_vendor_file:dir search; diff --git a/sepolicy/vendor/hal_gatekeeper_default.te b/sepolicy/vendor/hal_gatekeeper_default.te index b267f40..0cd9bb2 100644 --- a/sepolicy/vendor/hal_gatekeeper_default.te +++ b/sepolicy/vendor/hal_gatekeeper_default.te @@ -2,6 +2,4 @@ allow hal_gatekeeper_default gatekeeper_efs_file:file rw_file_perms; allow hal_gatekeeper_default gatekeeper_efs_file:dir search; allow hal_gatekeeper_default efs_file:dir search; allow hal_gatekeeper_default efs_file:file rw_file_perms; -allow hal_gatekeeper_default mobicore_vendor_file:dir search; -allow hal_gatekeeper_default mobicore_vendor_file:file rw_file_perms; allow hal_gatekeeper_default mnt_vendor_file:dir search; diff --git a/sepolicy/vendor/hal_keymaster_default.te b/sepolicy/vendor/hal_keymaster_default.te deleted file mode 100644 index 29652aa..0000000 --- a/sepolicy/vendor/hal_keymaster_default.te +++ /dev/null @@ -1,2 +0,0 @@ -allow hal_keymaster_default mobicore_vendor_file:dir search; -allow hal_keymaster_default mobicore_vendor_file:file rw_file_perms; diff --git a/sepolicy/vendor/hal_tee_default.te b/sepolicy/vendor/hal_tee_default.te deleted file mode 100644 index 100dc7c..0000000 --- a/sepolicy/vendor/hal_tee_default.te +++ /dev/null @@ -1,17 +0,0 @@ -type hal_tee_default, domain; -type hal_tee_default_exec, exec_type, vendor_file_type, file_type; - -binder_call(hal_tee_client, hal_tee_server) -binder_call(hal_tee_server, hal_tee_client) - -add_hwservice(hal_tee_server, hal_tee_hwservice) -allow hal_tee_client hal_tee_hwservice:hwservice_manager find; - -init_daemon_domain(hal_tee_default); - -hal_server_domain(hal_tee_default, hal_tee) - -hal_client_domain(hal_tee_default, hal_allocator) -allow hal_tee_default hidl_memory_hwservice:hwservice_manager find; - -allow hal_tee_default tee_device:chr_file rw_file_perms; diff --git a/sepolicy/vendor/hal_teeregistry_default.te b/sepolicy/vendor/hal_teeregistry_default.te deleted file mode 100644 index d1e629d..0000000 --- a/sepolicy/vendor/hal_teeregistry_default.te +++ /dev/null @@ -1,21 +0,0 @@ -type hal_teeregistry_default, domain; -type hal_teeregistry_default_exec, exec_type, vendor_file_type, file_type; - -binder_call(hal_teeregistry_client, hal_teeregistry_server) -binder_call(hal_teeregistry_server, hal_teeregistry_client) - -add_hwservice(hal_teeregistry_server, hal_teeregistry_hwservice) -allow hal_teeregistry_client hal_teeregistry_hwservice:hwservice_manager find; - -hal_server_domain(hal_teeregistry_default, hal_teeregistry) - -hal_client_domain(hal_teeregistry_default, hal_allocator) -allow hal_teeregistry_default hidl_memory_hwservice:hwservice_manager find; - -allow hal_teeregistry_default tee_device:chr_file rw_file_perms; - -allow hal_teeregistry_default mobicore_vendor_data_file:dir { rw_dir_perms create rename rmdir }; -allow hal_teeregistry_default mobicore_vendor_data_file:file { rw_file_perms rename create }; -allow hal_teeregistry_default mobicore_vendor_file:file { r_file_perms }; - -init_daemon_domain(hal_teeregistry_default); diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te index 937ae9d..c96ce33 100644 --- a/sepolicy/vendor/hwservice.te +++ b/sepolicy/vendor/hwservice.te @@ -5,6 +5,3 @@ type hal_sec_radio_channel_hwservice, hwservice_manager_type; type hal_vendor_eden_runtime_hwservice, hwservice_manager_type; type hal_vendor_multiframeprocessing_hwservice, hwservice_manager_type; type hal_vendor_iva_hwservice, hwservice_manager_type; - -type hal_tee_hwservice, hwservice_manager_type; -type hal_teeregistry_hwservice, hwservice_manager_type; diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts index 8614dd5..1495202 100644 --- a/sepolicy/vendor/hwservice_contexts +++ b/sepolicy/vendor/hwservice_contexts @@ -8,7 +8,3 @@ vendor.samsung.hardware.nfc::ISecNfc u:object_r:hal_nfc_h vendor.samsung_slsi.hardware.MultiFrameProcessing20::IMultiFrameProcessing20 u:object_r:hal_vendor_multiframeprocessing_hwservice:s0 vendor.samsung_slsi.hardware.eden_runtime::IEdenruntime u:object_r:hal_vendor_eden_runtime_hwservice:s0 vendor.samsung_slsi.hardware.iva::IIvaService u:object_r:hal_vendor_iva_hwservice:s0 - -vendor.trustonic.tee::ITee u:object_r:hal_tee_hwservice:s0 -vendor.trustonic.tee.tui::ITui u:object_r:hal_tee_hwservice:s0 -vendor.trustonic.teeregistry::ITeeRegistry u:object_r:hal_teeregistry_hwservice:s0 diff --git a/sepolicy/vendor/system_server.te b/sepolicy/vendor/system_server.te index 9d0cea0..9577018 100644 --- a/sepolicy/vendor/system_server.te +++ b/sepolicy/vendor/system_server.te @@ -9,7 +9,6 @@ allow system_server debugfs_mali_mem:file r_file_perms; allow system_server frp_block_device:blk_file rw_file_perms; -allow system_server mobicore_vendor_file:dir r_dir_perms; allow system_server sysfs_rtc:file r_file_perms; get_prop(system_server, vendor_radio_prop) diff --git a/sepolicy/vendor/tee.te b/sepolicy/vendor/tee.te index 6c1b3c5..fe4b686 100644 --- a/sepolicy/vendor/tee.te +++ b/sepolicy/vendor/tee.te @@ -1,9 +1,4 @@ allow tee efs_file:dir r_dir_perms; allow tee mnt_vendor_file:dir search; -allow tee mobicore_vendor_data_file:dir create_dir_perms; -allow tee mobicore_vendor_data_file:file create_file_perms; - -r_dir_file(tee, mobicore_vendor_file) - set_prop(tee, system_prop)