summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@google.com>2021-10-19 14:29:14 +0000
committerBart Van Assche <bvanassche@google.com>2021-10-19 14:31:52 +0000
commitef2f3aec105762a5f893a7e8cbb218d88bf26138 (patch)
tree107f6fd43e727ab6e8f47839c6b2ca44c9ce0f67
parent2ce2569b3507b20f6f733fcc6dcf79e72c66682d (diff)
downloadsunfish-sepolicy-android-s-v2-preview-1.tar.gz
Revert "Revert "Remove the bdev_type and sysfs_block_type SELinux attributes""android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
This reverts commit 2ce2569b3507b20f6f733fcc6dcf79e72c66682d. Reason for revert: Restore this patch since it was not necessary to revert this patch. Bug: 202520796 Change-Id: I640160b0c310e67fed6cf1374bf0fdfcbfdd5e1e
-rw-r--r--vendor/google/device.te2
-rw-r--r--vendor/qcom/common/device.te20
-rw-r--r--vendor/qcom/common/file.te2
3 files changed, 12 insertions, 12 deletions
diff --git a/vendor/google/device.te b/vendor/google/device.te
index 380f10a..db58020 100644
--- a/vendor/google/device.te
+++ b/vendor/google/device.te
@@ -3,6 +3,6 @@ type ipu_device, dev_type, mlstrustedobject;
type ramoops_device, dev_type;
type maxfg_device, dev_type;
type pwrstats_device, dev_type;
-type dp_block_device, dev_type, bdev_type;
+type dp_block_device, dev_type;
type qg_device, dev_type;
type battery_history_device, dev_type;
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index 9845762..211d3d4 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -15,11 +15,11 @@ type device_latency, dev_type;
type fm_radio_device, dev_type;
type modem_efs_partition_device, dev_type;
type ssd_device, dev_type;
-type rpmb_device, dev_type, bdev_type;
+type rpmb_device, dev_type;
type sg_device, dev_type;
type dip_device, dev_type;
type sd_device, dev_type;
-type ssd_block_device, dev_type, bdev_type;
+type ssd_block_device, dev_type;
type esoc_device, dev_type;
type ssr_device, dev_type;
type ramdump_device, dev_type;
@@ -50,12 +50,12 @@ type avtimer_device, dev_type;
type at_device, dev_type;
type bt_device, dev_type;
type wlan_device, dev_type;
-type rawdump_block_device, dev_type, bdev_type;
-type custom_ab_block_device, dev_type, bdev_type;
-type xbl_block_device, dev_type, bdev_type;
-type gpt_block_device, dev_type, bdev_type;
-type modem_block_device, dev_type, bdev_type;
-type uefi_block_device, dev_type, bdev_type;
-type persist_block_device, dev_type, bdev_type;
+type rawdump_block_device, dev_type;
+type custom_ab_block_device, dev_type;
+type xbl_block_device, dev_type;
+type gpt_block_device, dev_type;
+type modem_block_device, dev_type;
+type uefi_block_device, dev_type;
+type persist_block_device, dev_type;
type npu_device, dev_type;
-type devinfo_block_device, dev_type, bdev_type;
+type devinfo_block_device, dev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index 80594f3..23073eb 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -140,7 +140,7 @@ type hal_neuralnetworks_data_file, file_type, data_file_type;
type mpss_rfs_data_file, data_file_type, file_type;
type rfs_tombstone_data_file, data_file_type, file_type;
type sysfs_msm_wlan, sysfs_type, fs_type;
-type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type;
+type sysfs_scsi_devices_0000, sysfs_type, fs_type;
type proc_sched_energy_aware, proc_type, fs_type;
type proc_sched_updown_migrate, proc_type, fs_type;
type debugfs_wlan, debugfs_type, fs_type;