From e22b86c0c7c4acfb36fd68d468739140accac407 Mon Sep 17 00:00:00 2001 From: nnippon99 Date: Tue, 16 May 2023 14:42:41 +0300 Subject: [PATCH] Revert "sepolicy: Make fastrpc_shell_3 publicly available" This reverts commit 503d7c4cb5c60d1ea9ec0fbcdcfbb752faa71e13. Change-Id: I0ec697cb8a26b9cf311bd96fb59edfdb6b0fe551 --- sepolicy/vendor/adsprpcd.te | 3 --- sepolicy/vendor/app.te | 6 ++---- sepolicy/vendor/cdsprpcd.te | 1 - sepolicy/vendor/file_contexts | 5 ----- sepolicy/vendor/hal_camera_default.te | 1 - sepolicy/vendor/hal_neuralnetworks_default.te | 2 -- sepolicy/vendor/init.te | 1 - sepolicy/vendor/vppservice.te | 1 - 8 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 sepolicy/vendor/cdsprpcd.te delete mode 100644 sepolicy/vendor/vppservice.te diff --git a/sepolicy/vendor/adsprpcd.te b/sepolicy/vendor/adsprpcd.te index d5efe9f..58fe3e7 100644 --- a/sepolicy/vendor/adsprpcd.te +++ b/sepolicy/vendor/adsprpcd.te @@ -1,4 +1 @@ -type public_adsprpcd_file, file_type; - -r_dir_file(vendor_adsprpcd, public_adsprpcd_file) r_dir_file(vendor_adsprpcd, vendor_sysfs_graphics) diff --git a/sepolicy/vendor/app.te b/sepolicy/vendor/app.te index 7911162..23e2e3d 100644 --- a/sepolicy/vendor/app.te +++ b/sepolicy/vendor/app.te @@ -1,6 +1,4 @@ +allow { appdomain -isolated_app } vendor_xdsp_device:chr_file r_file_perms; + get_prop({ appdomain -isolated_app }, vendor_fingerprint_prop) get_prop({ appdomain -isolated_app }, vendor_tee_listener_prop) - -allow { appdomain -isolated_app } adsprpcd_file:dir r_dir_perms; -allow { appdomain -isolated_app } public_adsprpcd_file:file r_file_perms; -allow { appdomain -isolated_app } vendor_xdsp_device:chr_file r_file_perms; diff --git a/sepolicy/vendor/cdsprpcd.te b/sepolicy/vendor/cdsprpcd.te deleted file mode 100644 index cead8a9..0000000 --- a/sepolicy/vendor/cdsprpcd.te +++ /dev/null @@ -1 +0,0 @@ -r_dir_file(vendor_cdsprpcd, public_adsprpcd_file) diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index f5b6580..32833e1 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -19,11 +19,6 @@ /vendor/lib(64)?/libipebpsstriping\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libipebpsstriping170\.so u:object_r:same_process_hal_file:s0 -# Hexagon DSP-side executable needed for Halide operation -# This is labeled as public_adsprpcd_file as it needs to be read by apps -# (e.g. Google Camera App) -/mnt/vendor/dsp/fastrpc_shell_3 u:object_r:public_adsprpcd_file:s0 - # Fingerprint /dev/goodix_fp u:object_r:fingerprint_device:s0 /dev/silead_fp u:object_r:fingerprint_device:s0 diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te index 01d3439..d736104 100644 --- a/sepolicy/vendor/hal_camera_default.te +++ b/sepolicy/vendor/hal_camera_default.te @@ -18,7 +18,6 @@ allow hal_camera_client vendor_hal_camerapostproc_xiaomi_hwservice:hwservice_man allow hal_camera_default platform_app:binder { call transfer }; allow hal_camera_default priv_app:binder { call transfer }; -allow hal_camera_default public_adsprpcd_file:file r_file_perms; allow hal_camera_default system_server:binder { call transfer }; allow hal_camera_default vendor_xdsp_device:chr_file r_file_perms; allow hal_camera_default vendor_xdsp_device:chr_file { ioctl open read write }; diff --git a/sepolicy/vendor/hal_neuralnetworks_default.te b/sepolicy/vendor/hal_neuralnetworks_default.te index 7dfa669..2e81a1c 100644 --- a/sepolicy/vendor/hal_neuralnetworks_default.te +++ b/sepolicy/vendor/hal_neuralnetworks_default.te @@ -1,3 +1 @@ -r_dir_file(vendor_hal_neuralnetworks_default, public_adsprpcd_file) - get_prop(vendor_hal_neuralnetworks_default, vendor_adsprpc_prop) diff --git a/sepolicy/vendor/init.te b/sepolicy/vendor/init.te index af0089c..15d9b68 100644 --- a/sepolicy/vendor/init.te +++ b/sepolicy/vendor/init.te @@ -1,4 +1,3 @@ -allow init adsprpcd_file:file mounton; allow init debugfs_tracing_debug:dir mounton; allow init vendor_sysfs_graphics:file mounton; diff --git a/sepolicy/vendor/vppservice.te b/sepolicy/vendor/vppservice.te deleted file mode 100644 index e9e1809..0000000 --- a/sepolicy/vendor/vppservice.te +++ /dev/null @@ -1 +0,0 @@ -r_dir_file(vendor_vppservice, public_adsprpcd_file)