From a90c8fe1b51e83f2d94226105fac887a2c06fd89 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Thu, 2 Sep 2021 13:24:46 +0800 Subject: [PATCH] review bootdevice_sysdev Bug: 196916111 Test: boot with bootdevice_sysdev labeled Change-Id: I938fe18718356bf4156bb55937528a1ca3e072fb --- legacy/file.te | 2 -- legacy/file_contexts | 5 ----- legacy/vendor_init.te | 1 - {legacy => whitechapel_pro}/bootdevice_sysdev.te | 0 whitechapel_pro/file.te | 1 + whitechapel_pro/file_contexts | 1 + whitechapel_pro/vendor_init.te | 2 ++ 7 files changed, 4 insertions(+), 8 deletions(-) rename {legacy => whitechapel_pro}/bootdevice_sysdev.te (100%) diff --git a/legacy/file.te b/legacy/file.te index f0920be4..4ceeeff7 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -70,8 +70,6 @@ type sysfs_scsi_devices_0000, sysfs_type, fs_type; type debugfs_f2fs, debugfs_type, fs_type; type proc_f2fs, proc_type, fs_type; -type bootdevice_sysdev, dev_type; - # ZRam type per_boot_file, file_type, data_file_type, core_data_file_type; diff --git a/legacy/file_contexts b/legacy/file_contexts index f3fd4f09..c93aa364 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -28,11 +28,6 @@ # Wireless charger HAL /(vendor|system/vendor)/bin/hw/vendor\.google\.wireless_charger@1\.3-service-vendor u:object_r:hal_wlc_exec:s0 -# -# Exynos Block Devices -# -/dev/sys/block/bootdevice(/.*)? u:object_r:bootdevice_sysdev:s0 - # # Exynos Devices # diff --git a/legacy/vendor_init.te b/legacy/vendor_init.te index 759fa83d..b2e53a88 100644 --- a/legacy/vendor_init.te +++ b/legacy/vendor_init.te @@ -12,7 +12,6 @@ set_prop(vendor_init, vendor_thermal_prop) allow vendor_init proc_dirty:file w_file_perms; allow vendor_init proc_sched:file write; -allow vendor_init bootdevice_sysdev:file create_file_perms; userdebug_or_eng(` set_prop(vendor_init, logpersistd_logging_prop) diff --git a/legacy/bootdevice_sysdev.te b/whitechapel_pro/bootdevice_sysdev.te similarity index 100% rename from legacy/bootdevice_sysdev.te rename to whitechapel_pro/bootdevice_sysdev.te diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index 07ea9e8b..ed9626b8 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -13,6 +13,7 @@ type vendor_fw_file, vendor_file_type, file_type; # sysfs type sysfs_chosen, sysfs_type, fs_type; type sysfs_ota, sysfs_type, fs_type; +type bootdevice_sysdev, dev_type; # vendor extra images type modem_img_file, contextmount_type, file_type, vendor_file_type; diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index ca65d1a1..c61ab7fd 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -19,6 +19,7 @@ /dev/umts_rfs0 u:object_r:radio_device:s0 /dev/umts_dm0 u:object_r:radio_device:s0 /dev/umts_router u:object_r:radio_device:s0 +/dev/sys/block/bootdevice(/.*)? u:object_r:bootdevice_sysdev:s0 /dev/socket/chre u:object_r:chre_socket:s0 /dev/block/sda u:object_r:sda_block_device:s0 /dev/block/platform/14700000\.ufs/by-name/abl_[ab] u:object_r:custom_ab_block_device:s0 diff --git a/whitechapel_pro/vendor_init.te b/whitechapel_pro/vendor_init.te index 4218745a..250d228e 100644 --- a/whitechapel_pro/vendor_init.te +++ b/whitechapel_pro/vendor_init.te @@ -1 +1,3 @@ +allow vendor_init bootdevice_sysdev:file create_file_perms; + set_prop(vendor_init, vendor_cbd_prop)