Merge tag 'LA.UM.11.2.1.r1-01900-sdm660.0' into staging/lineage-20.0_merge-LA.UM.11.2.1.r1-01900-sdm660.0
"LA.UM.11.2.1.r1-01900-sdm660.0"
# By Neelu Maheshwari (1) and Sanghoon Shin (1)
# Via Gerrit - the friendly Code Review server (1) and Linux Build Service Account (1)
* tag 'LA.UM.11.2.1.r1-01900-sdm660.0':
sepolicy: fix issue on non-snap target
Sepolicy : Fixed Multiple AVC Denials in 11.2.1 SDM660.
Conflicts:
generic/vendor/common/hwservice.te
generic/vendor/common/hwservice_contexts
legacy/vendor/msm8996/hal_qccvndhalservice.te
legacy/vendor/sdm660/file_contexts
qva/vendor/common/hwservice.te
qva/vendor/common/hwservice_contexts
Change-Id: Ic0fa79f8c74969f25061f50706000abee5b0d008
diff --git a/legacy/vendor/common/init.te b/legacy/vendor/common/init.te
index 0a14af2..628f817 100644
--- a/legacy/vendor/common/init.te
+++ b/legacy/vendor/common/init.te
@@ -94,3 +94,4 @@
allow init firmware_file:filesystem getattr;
allow init proc:file w_file_perms;
allow init bt_firmware_file:filesystem getattr;
+allow init sysfs_mmc_host:file w_file_perms;
diff --git a/legacy/vendor/common/platform_app.te b/legacy/vendor/common/platform_app.te
index e816eea..0cb9920 100644
--- a/legacy/vendor/common/platform_app.te
+++ b/legacy/vendor/common/platform_app.te
@@ -64,6 +64,7 @@
get_prop(platform_app, vendor_mpctl_prop)
#fm
hal_client_domain(platform_app, hal_fm);
+hal_client_domain(platform_app, hal_fingerprint);
allow platform_app fm_radio_device:chr_file r_file_perms;
#allow platform app to access btconfigstore hal
hal_client_domain(platform_app, hal_btconfigstore);
diff --git a/legacy/vendor/common/tlocd.te b/legacy/vendor/common/tlocd.te
index 4fef4c7..5a067f7 100644
--- a/legacy/vendor/common/tlocd.te
+++ b/legacy/vendor/common/tlocd.te
@@ -50,3 +50,4 @@
allow tlocd ion_device:chr_file rw_file_perms;
allow tlocd location_data_file:dir search;
+allow tlocd vendor_smcinvoke_device:chr_file rw_file_perms;
diff --git a/legacy/vendor/sdm660/file_contexts b/legacy/vendor/sdm660/file_contexts
index d9011e2..2b004eb 100644
--- a/legacy/vendor/sdm660/file_contexts
+++ b/legacy/vendor/sdm660/file_contexts
@@ -161,4 +161,8 @@
#sysfs graphics
/sys/devices/virtual/graphics/fb0/supported_bitclk u:object_r:sysfs_graphics:s0
+/sys/devices/platform/soc/c0c4000.sdhci/mmc_host/mmc0/mmc0:0001/block/mmcblk0/queue/discard_max_bytes u:object_r:sysfs_mmc_host:s0
+
+/sys/devices/platform/soc/151c0000.slim/tavil-slim-pgd/wakeup/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0
+
/sys/devices/soc/780000.qcom,msm-core/uio/uio[0-9]+(/.*)? u:object_r:sysfs_uio_file:s0
diff --git a/legacy/vendor/sdm660/genfs_contexts b/legacy/vendor/sdm660/genfs_contexts
index cd926a0..6430542 100644
--- a/legacy/vendor/sdm660/genfs_contexts
+++ b/legacy/vendor/sdm660/genfs_contexts
@@ -154,3 +154,14 @@
genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,usb-pdphy@1700/usbpd/usbpd0/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/power_supply/pc_port/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/power_supply/battery/wakeup u:object_r:sysfs_wakeup:s0
+
+genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,usb-pdphy@1700/extcon/extcon4/cable.0/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,usb-pdphy@1700/extcon/extcon4/cable.1/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,usb-pdphy@1700/extcon/extcon4/cable.2/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon0/cable.1/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon1/cable.1/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,mdss_wb_panel/extcon/extcon2/cable.0/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/extcon/extcon3/cable.0/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/800f000.qcom,spmi/spmi-0/spmi0-00/800f000.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/extcon/extcon3/cable.1/name u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon0/state u:object_r:sysfs_graphics:s0
+genfscon sysfs /devices/platform/soc/soc:qcom,msm-ext-disp/extcon/extcon1/state u:object_r:sysfs_graphics:s0
diff --git a/qva/private/file_contexts b/qva/private/file_contexts
index c51f183..e0cffa1 100644
--- a/qva/private/file_contexts
+++ b/qva/private/file_contexts
@@ -55,6 +55,7 @@
/(system_ext|system/system_ext)/bin/qdtservice u:object_r:vendor_qdtservice_exec:s0
/(system|system_ext|system/system_ext)/bin/sigma_miracasthalservice u:object_r:vendor_sigmahal_qti_exec:s0
/(system_ext|system/system_ext)/bin/qccsyshalservice u:object_r:vendor_qccsyshal_qti_exec:s0
+/(system_ext|system/system_ext)/bin/qccsyshal@[1-9]\.[1-9]-service u:object_r:vendor_qccsyshal_qti_exec:s0
/(system_ext|system/system_ext)/bin/mmi u:object_r:vendor_mmi_sys_exec:s0
/(system_ext|system/system_ext)/bin/mmi_diag u:object_r:vendor_mmi_sys_exec:s0
/(system_ext|system/system_ext)/bin/qspmsvc u:object_r:vendor_qspmsvc_exec:s0
diff --git a/qva/private/seapp_contexts b/qva/private/seapp_contexts
index 250c8a1..19d2ca0 100644
--- a/qva/private/seapp_contexts
+++ b/qva/private/seapp_contexts
@@ -31,7 +31,7 @@
user=_app seinfo=platform name=com.qualcomm.qti.ssmeditor domain=vendor_qconfig_app type=app_data_file levelfrom=all
#Add new domain for QCC
-user=system seinfo=platform name=com.qualcomm.qti.qdma isPrivApp=true domain=vendor_qcc_app type=system_app_data_file
+user=system seinfo=platform name=com.qti.qcc isPrivApp=true domain=vendor_qcc_app type=system_app_data_file
#Add new domain for QCCLMTP
user=system seinfo=platform name=com.qualcomm.qti.qcclmtp isPrivApp=true domain=vendor_qcc_lmtp_app type=system_app_data_file
#Add new domain for QCC-Utils