From 3a1c10bb76b1d14b7b26b367748359df28a70947 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 8 Oct 2021 14:55:37 -0700 Subject: [PATCH] Stop using the bdev_type and sysfs_block_type SELinux attributes Stop using these attributes since these will be removed soon. This commit reverts 37b574130114 ("Add the 'bdev_type' attribute to all block device types"). Bug: 202520796 Test: Untested. Change-Id: I00f10d1fd164b6ca01ecd5cffd2012acfc05eeca Signed-off-by: Bart Van Assche --- whitechapel/vendor/google/device.te | 16 ++++++++-------- whitechapel/vendor/google/file.te | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te index 6fcfd0d0..058174d7 100644 --- a/whitechapel/vendor/google/device.te +++ b/whitechapel/vendor/google/device.te @@ -1,16 +1,16 @@ # Block Devices -type efs_block_device, dev_type, bdev_type; -type modem_block_device, dev_type, bdev_type; -type modem_userdata_block_device, dev_type, bdev_type; -type persist_block_device, dev_type, bdev_type; -type sda_block_device, dev_type, bdev_type; -type mfg_data_block_device, dev_type, bdev_type; +type efs_block_device, dev_type; +type modem_block_device, dev_type; +type modem_userdata_block_device, dev_type; +type persist_block_device, dev_type; +type sda_block_device, dev_type; +type mfg_data_block_device, dev_type; # Exynos devices type vendor_gnss_device, dev_type; type vendor_toe_device, dev_type; -type custom_ab_block_device, dev_type, bdev_type; -type devinfo_block_device, dev_type, bdev_type; +type custom_ab_block_device, dev_type; +type devinfo_block_device, dev_type; # usbpd type logbuffer_device, dev_type; diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te index 8447cf5b..90098249 100644 --- a/whitechapel/vendor/google/file.te +++ b/whitechapel/vendor/google/file.te @@ -78,7 +78,7 @@ type updated_wifi_firmware_data_file, file_type, data_file_type; type mediadrm_vendor_data_file, file_type, data_file_type; # Storage Health HAL -type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type; +type sysfs_scsi_devices_0000, sysfs_type, fs_type; type debugfs_f2fs, debugfs_type, fs_type; type proc_f2fs, proc_type, fs_type;