From 48d17692309ead47caa1436812c84a4c9211a4a1 Mon Sep 17 00:00:00 2001 From: chrisl7 Date: Wed, 8 Nov 2023 16:53:25 +0000 Subject: [PATCH] Revert "sepolicy: bengal: Add pwr and powermodule sepolicy rules" This reverts commit 8f99859250ae20cad612709af55661e62b1b8ab6. [1] - https://gerrit.aospa.co/c/AOSPA/android_device_qcom_common/+/36469 Change-Id: If9261e7a4ba332b1cc93365fc719ffd14617a8a5 --- sepolicy/generic/vendor/bengal/file.te | 30 --------- sepolicy/generic/vendor/bengal/file_contexts | 2 - .../generic/vendor/bengal/hal_perf_default.te | 1 - .../generic/vendor/bengal/poweroptservice.te | 66 ------------------- sepolicy/qva/vendor/bengal/file_contexts | 4 -- sepolicy/qva/vendor/bengal/powermodule_app.te | 38 ----------- sepolicy/qva/vendor/bengal/seapp_contexts | 2 - 7 files changed, 143 deletions(-) delete mode 100644 sepolicy/generic/vendor/bengal/file.te delete mode 100644 sepolicy/generic/vendor/bengal/file_contexts delete mode 100644 sepolicy/generic/vendor/bengal/hal_perf_default.te delete mode 100644 sepolicy/generic/vendor/bengal/poweroptservice.te delete mode 100644 sepolicy/qva/vendor/bengal/powermodule_app.te delete mode 100644 sepolicy/qva/vendor/bengal/seapp_contexts diff --git a/sepolicy/generic/vendor/bengal/file.te b/sepolicy/generic/vendor/bengal/file.te deleted file mode 100644 index 0d940146..00000000 --- a/sepolicy/generic/vendor/bengal/file.te +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2021, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#Define the files used by powermodule -type vendor_pm_data_file, file_type, data_file_type; -type vendor_sysfs_guestvm, fs_type, sysfs_type;; \ No newline at end of file diff --git a/sepolicy/generic/vendor/bengal/file_contexts b/sepolicy/generic/vendor/bengal/file_contexts deleted file mode 100644 index a3ff21a8..00000000 --- a/sepolicy/generic/vendor/bengal/file_contexts +++ /dev/null @@ -1,2 +0,0 @@ -#poweropt-service -/(vendor|system/vendor)/bin/poweropt-service u:object_r:vendor_hal_poweroptservice_qti_exec:s0 diff --git a/sepolicy/generic/vendor/bengal/hal_perf_default.te b/sepolicy/generic/vendor/bengal/hal_perf_default.te deleted file mode 100644 index f743015e..00000000 --- a/sepolicy/generic/vendor/bengal/hal_perf_default.te +++ /dev/null @@ -1 +0,0 @@ -hal_client_domain(vendor_hal_perf_default, vendor_hal_poweroptservice) diff --git a/sepolicy/generic/vendor/bengal/poweroptservice.te b/sepolicy/generic/vendor/bengal/poweroptservice.te deleted file mode 100644 index 522c05f6..00000000 --- a/sepolicy/generic/vendor/bengal/poweroptservice.te +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 2020, The Linux Foundation. All rights reserved. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. -# SPDX-License-Identifier: BSD-3-Clause-Clear - - -type vendor_hal_poweroptservice_qti, domain; -#mark as hal server domain -hal_server_domain(vendor_hal_poweroptservice_qti, vendor_hal_poweroptservice) - -type vendor_hal_poweroptservice_qti_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(vendor_hal_poweroptservice_qti) - -#allow hwbinder call bw client and server -binder_call(vendor_hal_poweroptservice_client, vendor_hal_poweroptservice_server) -binder_call(vendor_hal_poweroptservice_server, vendor_hal_poweroptservice_client) - -#allow service to be added to hwservice list -hal_attribute_hwservice(vendor_hal_poweroptservice, vendor_hal_poweroptservice_hwservice) - -hal_client_domain(vendor_hal_poweroptservice_qti, vendor_hal_perf) -hal_client_domain(vendor_hal_poweroptservice_qti, hal_graphics_composer) - -get_prop(vendor_hal_poweroptservice_qti, vendor_mpctl_prop) - -r_dir_file(vendor_hal_poweroptservice_qti, vendor_sysfs_graphics) -r_dir_file(vendor_hal_poweroptservice_qti, vendor_sysfs_kgsl) -r_dir_file(vendor_hal_poweroptservice_qti, sysfs_android_usb) - -allow vendor_hal_poweroptservice_qti vendor_qdisplay_service:service_manager find; -allow vendor_hal_poweroptservice_qti input_device:dir r_dir_perms; -allow vendor_hal_poweroptservice_qti input_device:chr_file rw_file_perms; - -allow vendor_hal_poweroptservice_qti vendor_sysfs_scsi_host:dir r_dir_perms; -allow vendor_hal_poweroptservice_qti vendor_sysfs_scsi_host:file rw_file_perms; - -get_prop(vendor_hal_poweroptservice_qti, vendor_display_prop) -get_prop(vendor_hal_poweroptservice_qti, vendor_soc_name_prop) - -allow vendor_hal_poweroptservice_qti vendor_pm_data_file:dir create_dir_perms; -allow vendor_hal_poweroptservice_qti vendor_pm_data_file:file create_file_perms; diff --git a/sepolicy/qva/vendor/bengal/file_contexts b/sepolicy/qva/vendor/bengal/file_contexts index 4394725e..62b9cdf9 100644 --- a/sepolicy/qva/vendor/bengal/file_contexts +++ b/sepolicy/qva/vendor/bengal/file_contexts @@ -25,10 +25,6 @@ #Graphics /sys/devices/platform/soc/5900000.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpubusy u:object_r:vendor_sysfs_kgsl_gpubusy:s0 -## 5.15 LAbel -# Power -/sys/devices(/platform)?/soc/[a-f0-9]+.ufshc/spm_lvl u:object_r:vendor_sysfs_scsi_host:s0 - # UFS Devices /dev/block/platform/soc/4804000.ufshc/by-name/vendor u:object_r:system_block_device:s0 /dev/block/platform/soc/4804000.ufshc/by-name/product u:object_r:system_block_device:s0 diff --git a/sepolicy/qva/vendor/bengal/powermodule_app.te b/sepolicy/qva/vendor/bengal/powermodule_app.te deleted file mode 100644 index dfb056eb..00000000 --- a/sepolicy/qva/vendor/bengal/powermodule_app.te +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2021, The Linux Foundation. All rights reserved. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#Define Domain for Power module -type vendor_powermodule_app, domain; -app_domain(vendor_powermodule_app); - -hal_client_domain(vendor_powermodule_app, vendor_hal_perf); -hal_client_domain(vendor_powermodule_app, vendor_hal_poweroptservice) - -# Allow invoking activity of vendor_powermodule_app -allow vendor_powermodule_app app_api_service:service_manager find; - -dontaudit vendor_powermodule_app default_prop:file read; diff --git a/sepolicy/qva/vendor/bengal/seapp_contexts b/sepolicy/qva/vendor/bengal/seapp_contexts deleted file mode 100644 index 2737c2b7..00000000 --- a/sepolicy/qva/vendor/bengal/seapp_contexts +++ /dev/null @@ -1,2 +0,0 @@ -#Add new domain for powermodule app -user=_app seinfo=platform name=.powermodule domain=vendor_powermodule_app type=app_data_file levelFrom=all