summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@google.com>2021-10-21 03:24:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-21 03:24:41 +0000
commitbb4e94869c89750766b0f594685c7dff24fe6139 (patch)
tree3d103e07cd77b205a7a139967b69d3077f5e5fad
parent7a3794697fd56625ed39082eb0a554f55a50ed93 (diff)
parent37ae749c20a8027e2c6042044180eb1bdbc5c4f2 (diff)
downloadbonito-sepolicy-bb4e94869c89750766b0f594685c7dff24fe6139.tar.gz
Revert "Revert "Remove the bdev_type and sysfs_block_type SELinux attributes"" am: 37ae749c20
Original change: https://android-review.googlesource.com/c/device/google/bonito-sepolicy/+/1863013 Change-Id: I6ebac98f6d88fa75a602f97952f8b3f51c364b82
-rw-r--r--vendor/qcom/common/device.te16
-rw-r--r--vendor/qcom/common/file.te2
2 files changed, 9 insertions, 9 deletions
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index b1fa00cd..11ec49bb 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -1,15 +1,15 @@
-type ab_block_device, dev_type, bdev_type;
+type ab_block_device, dev_type;
type at_device, dev_type;
type avtimer_device, dev_type;
type bt_device, dev_type;
-type devinfo_block_device, dev_type, bdev_type;
+type devinfo_block_device, dev_type;
type diag_device, dev_type, mlstrustedobject;
type dsp_device, dev_type;
type easel_device, dev_type, mlstrustedobject;
-type gpt_block_device, dev_type, bdev_type;
+type gpt_block_device, dev_type;
type ipa_dev, dev_type;
-type modem_block_device, dev_type, bdev_type;
-type persist_block_device, dev_type, bdev_type;
+type modem_block_device, dev_type;
+type persist_block_device, dev_type;
type qce_device, dev_type;
type qsee_ipc_irq_spss_device, dev_type;
type qdsp_device, dev_type, mlstrustedobject;
@@ -19,10 +19,10 @@ type seemplog_device, dev_type;
type sg_device, dev_type;
type smd_device, dev_type;
type spcom_device, dev_type;
-type ssd_block_device, dev_type, bdev_type;
+type ssd_block_device, dev_type;
type ssr_device, dev_type;
type wlan_device, dev_type;
-type xbl_block_device, dev_type, bdev_type;
+type xbl_block_device, dev_type;
# TODO: Replace KM3 with KM4 (b/112339903)
-type rpmb_device, dev_type, bdev_type;
+type rpmb_device, dev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index e4435d17..5ca58bab 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -13,7 +13,7 @@ type sysfs_msm_wlan, sysfs_type, fs_type;
type sysfs_poweroff, sysfs_type, fs_type;
type sysfs_rmtfs, sysfs_type, fs_type;
type sysfs_soc, 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 sysfs_scsi_devices_other, sysfs_type, fs_type;
type sysfs_mmc, sysfs_type, fs_type;
type sysfs_system_sleep_stats, sysfs_type, fs_type;