diff --git a/legacy/whitechapel_pro/device.te b/legacy/whitechapel_pro/device.te index 44b82170..74ecd834 100644 --- a/legacy/whitechapel_pro/device.te +++ b/legacy/whitechapel_pro/device.te @@ -1,6 +1,5 @@ type sda_block_device, dev_type; type devinfo_block_device, dev_type; -type modem_block_device, dev_type; type custom_ab_block_device, dev_type; type persist_block_device, dev_type; type efs_block_device, dev_type; diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index d114d26e..20f386c2 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -1,11 +1,8 @@ # Data type rild_vendor_data_file, file_type, data_file_type; -type vendor_log_file, file_type, data_file_type; type vendor_hwc_log_file, file_type, data_file_type; -type vendor_rfsd_log_file, file_type, data_file_type; type modem_stat_data_file, file_type, data_file_type; type vendor_slog_file, file_type, data_file_type; -type radio_vendor_data_file, file_type, data_file_type; type updated_wifi_firmware_data_file, file_type, data_file_type; type tcpdump_vendor_data_file, file_type, data_file_type; type vendor_camera_data_file, file_type, data_file_type; @@ -19,12 +16,8 @@ type powerstats_vendor_data_file, file_type, data_file_type; userdebug_or_eng(` typeattribute tcpdump_vendor_data_file mlstrustedobject; typeattribute vendor_slog_file mlstrustedobject; - typeattribute radio_vendor_data_file mlstrustedobject; ') -# Exynos Firmware -type vendor_fw_file, vendor_file_type, file_type; - # sysfs type sysfs_chosen, sysfs_type, fs_type; type sysfs_ota, sysfs_type, fs_type; @@ -57,10 +50,6 @@ type vendor_dmabuf_debugfs, fs_type, debugfs_type; type vendor_dri_debugfs, fs_type, debugfs_type; type vendor_page_pinner_debugfs, fs_type, debugfs_type; -# vendor extra images -type modem_img_file, contextmount_type, file_type, vendor_file_type; -allow modem_img_file self:filesystem associate; - # persist type persist_battery_file, file_type, vendor_persist_type; type persist_camera_file, file_type, vendor_persist_type; @@ -82,7 +71,6 @@ type vendor_usf_reg_edit, vendor_file_type, file_type; type vendor_dumpsys, vendor_file_type, file_type; # Modem -type modem_efs_file, file_type; type modem_userdata_file, file_type; # SecureElement diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts index 400c54ee..a34cc089 100644 --- a/legacy/whitechapel_pro/file_contexts +++ b/legacy/whitechapel_pro/file_contexts @@ -6,7 +6,6 @@ /vendor/bin/chre u:object_r:chre_exec:s0 /vendor/bin/cbd u:object_r:cbd_exec:s0 /vendor/bin/modem_svc_sit u:object_r:modem_svc_sit_exec:s0 -/vendor/bin/rfsd u:object_r:rfsd_exec:s0 /vendor/bin/bipchmgr u:object_r:bipchmgr_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0 /vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 @@ -42,7 +41,6 @@ /vendor/bin/hw/android\.hardware\.gxp\.logging@service-gxp-logging u:object_r:gxp_logging_exec:s0 # Vendor Firmwares -/vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 /vendor/firmware/mali_csffw\.bin u:object_r:same_process_hal_file:s0 /vendor/firmware/gxp_fw_core[0-3] u:object_r:same_process_hal_file:s0 @@ -142,13 +140,6 @@ /dev/st54spi u:object_r:st54spi_device:s0 /dev/st33spi u:object_r:st33spi_device:s0 /dev/ttyGS[0-3] u:object_r:serial_device:s0 -/dev/oem_ipc[0-7] u:object_r:radio_device:s0 -/dev/umts_boot0 u:object_r:radio_device:s0 -/dev/umts_ipc0 u:object_r:radio_device:s0 -/dev/umts_ipc1 u:object_r:radio_device:s0 -/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/logbuffer_tcpm u:object_r:logbuffer_device:s0 /dev/sys/block/bootdevice(/.*)? u:object_r:bootdevice_sysdev:s0 /dev/socket/chre u:object_r:chre_socket:s0 @@ -171,7 +162,6 @@ /dev/block/platform/13200000\.ufs/by-name/metadata u:object_r:metadata_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/mfg_data u:object_r:mfg_data_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/misc u:object_r:misc_block_device:s0 -/dev/block/platform/13200000\.ufs/by-name/modem_[ab] u:object_r:modem_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/modem_userdata u:object_r:modem_userdata_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/pbl_[ab] u:object_r:custom_ab_block_device:s0 /dev/block/platform/13200000\.ufs/by-name/persist u:object_r:persist_block_device:s0 @@ -187,11 +177,8 @@ # Data /data/vendor/slog(/.*)? u:object_r:vendor_slog_file:s0 -/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 /data/vendor/modem_stat(/.*)? u:object_r:modem_stat_data_file:s0 -/data/vendor/log(/.*)? u:object_r:vendor_log_file:s0 /data/vendor/log/hwc(/.*)? u:object_r:vendor_hwc_log_file:s0 -/data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0 /data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 /data/nfc(/.*)? u:object_r:nfc_data_file:s0 @@ -216,9 +203,6 @@ /mnt/vendor/persist/display(/.*)? u:object_r:persist_display_file:s0 # Extra mount images -/mnt/vendor/modem_img(/.*)? u:object_r:modem_img_file:s0 -/mnt/vendor/efs(/.*)? u:object_r:modem_efs_file:s0 -/mnt/vendor/efs_backup(/.*)? u:object_r:modem_efs_file:s0 /mnt/vendor/modem_userdata(/.*)? u:object_r:modem_userdata_file:s0 # Raw HID device diff --git a/legacy/whitechapel_pro/init.te b/legacy/whitechapel_pro/init.te index 3175db8c..4c83126d 100644 --- a/legacy/whitechapel_pro/init.te +++ b/legacy/whitechapel_pro/init.te @@ -11,7 +11,6 @@ allow init custom_ab_block_device:lnk_file relabelto; allow init boot_block_device:lnk_file relabelto; allow init persist_file:dir mounton; -allow init modem_efs_file:dir mounton; allow init modem_userdata_file:dir mounton; allow init ram_device:blk_file w_file_perms; allow init sysfs_scsi_devices_0000:file w_file_perms; diff --git a/legacy/whitechapel_pro/property.te b/legacy/whitechapel_pro/property.te index 2fd73142..5d7f16ee 100644 --- a/legacy/whitechapel_pro/property.te +++ b/legacy/whitechapel_pro/property.te @@ -1,9 +1,7 @@ vendor_internal_prop(vendor_diag_prop) vendor_internal_prop(vendor_slog_prop) -vendor_internal_prop(vendor_modem_prop) vendor_internal_prop(vendor_persist_config_default_prop) vendor_internal_prop(vendor_cbd_prop) -vendor_internal_prop(vendor_rild_prop) vendor_internal_prop(vendor_carrier_prop) vendor_internal_prop(vendor_ssrdump_prop) vendor_internal_prop(vendor_wifi_version) diff --git a/legacy/whitechapel_pro/property_contexts b/legacy/whitechapel_pro/property_contexts index 88d814d1..d26b161d 100644 --- a/legacy/whitechapel_pro/property_contexts +++ b/legacy/whitechapel_pro/property_contexts @@ -17,25 +17,10 @@ vendor.sys.silentlog. u:object_r:vendor_slog_prop:s0 vendor.sys.exynos.slog. u:object_r:vendor_slog_prop:s0 persist.vendor.sys.silentlog u:object_r:vendor_slog_prop:s0 -# for modem -persist.vendor.modem. u:object_r:vendor_modem_prop:s0 -vendor.modem. u:object_r:vendor_modem_prop:s0 -vendor.sys.modem. u:object_r:vendor_modem_prop:s0 -vendor.sys.modem_reset u:object_r:vendor_modem_prop:s0 -ro.vendor.sys.modem. u:object_r:vendor_modem_prop:s0 -vendor.sys.exynos.modempath u:object_r:vendor_modem_prop:s0 -persist.vendor.sys.modem. u:object_r:vendor_modem_prop:s0 - # for cbd vendor.cbd. u:object_r:vendor_cbd_prop:s0 persist.vendor.cbd. u:object_r:vendor_cbd_prop:s0 -# for rild -persist.vendor.ril. u:object_r:vendor_rild_prop:s0 -vendor.ril. u:object_r:vendor_rild_prop:s0 -vendor.radio. u:object_r:vendor_rild_prop:s0 -vendor.sys.rild_reset u:object_r:vendor_rild_prop:s0 -persist.vendor.radio. u:object_r:vendor_rild_prop:s0 ro.vendor.config.build_carrier u:object_r:vendor_carrier_prop:s0 persist.vendor.config. u:object_r:vendor_persist_config_default_prop:s0 diff --git a/vendor/device.te b/vendor/device.te new file mode 100644 index 00000000..7fd0e359 --- /dev/null +++ b/vendor/device.te @@ -0,0 +1 @@ +type modem_block_device, dev_type; diff --git a/vendor/file.te b/vendor/file.te new file mode 100644 index 00000000..990bfbf7 --- /dev/null +++ b/vendor/file.te @@ -0,0 +1,18 @@ +# Data +type vendor_log_file, file_type, data_file_type; +type vendor_rfsd_log_file, file_type, data_file_type; +type radio_vendor_data_file, file_type, data_file_type; +userdebug_or_eng(` + typeattribute radio_vendor_data_file mlstrustedobject; +') + +# Modem +type modem_efs_file, file_type; + +# Exynos Firmware +type vendor_fw_file, vendor_file_type, file_type; + +# vendor extra images +type modem_img_file, contextmount_type, file_type, vendor_file_type; +allow modem_img_file self:filesystem associate; + diff --git a/vendor/file_contexts b/vendor/file_contexts new file mode 100644 index 00000000..ac39badf --- /dev/null +++ b/vendor/file_contexts @@ -0,0 +1,25 @@ +# Binaries +/vendor/bin/rfsd u:object_r:rfsd_exec:s0 + +# Data +/data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0 +/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 +/data/vendor/log(/.*)? u:object_r:vendor_log_file:s0 + +# vendor extra images +/mnt/vendor/efs(/.*)? u:object_r:modem_efs_file:s0 +/mnt/vendor/efs_backup(/.*)? u:object_r:modem_efs_file:s0 +/mnt/vendor/modem_img(/.*)? u:object_r:modem_img_file:s0 + +# Vendor Firmwares +/vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 + +# Devices +/dev/oem_ipc[0-7] u:object_r:radio_device:s0 +/dev/umts_boot0 u:object_r:radio_device:s0 +/dev/umts_ipc0 u:object_r:radio_device:s0 +/dev/umts_ipc1 u:object_r:radio_device:s0 +/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/block/platform/13200000\.ufs/by-name/modem_[ab] u:object_r:modem_block_device:s0 diff --git a/vendor/init.te b/vendor/init.te new file mode 100644 index 00000000..2e722093 --- /dev/null +++ b/vendor/init.te @@ -0,0 +1 @@ +allow init modem_efs_file:dir mounton; diff --git a/vendor/property.te b/vendor/property.te new file mode 100644 index 00000000..533301b4 --- /dev/null +++ b/vendor/property.te @@ -0,0 +1,2 @@ +vendor_internal_prop(vendor_modem_prop) +vendor_internal_prop(vendor_rild_prop) diff --git a/vendor/property_contexts b/vendor/property_contexts new file mode 100644 index 00000000..1d2fdaca --- /dev/null +++ b/vendor/property_contexts @@ -0,0 +1,16 @@ +# Modem +persist.vendor.modem. u:object_r:vendor_modem_prop:s0 +vendor.modem. u:object_r:vendor_modem_prop:s0 +vendor.sys.modem. u:object_r:vendor_modem_prop:s0 +vendor.sys.modem_reset u:object_r:vendor_modem_prop:s0 +ro.vendor.sys.modem. u:object_r:vendor_modem_prop:s0 +vendor.sys.exynos.modempath u:object_r:vendor_modem_prop:s0 +persist.vendor.sys.modem. u:object_r:vendor_modem_prop:s0 + +# for rild +persist.vendor.ril. u:object_r:vendor_rild_prop:s0 +vendor.ril. u:object_r:vendor_rild_prop:s0 +vendor.radio. u:object_r:vendor_rild_prop:s0 +vendor.sys.rild_reset u:object_r:vendor_rild_prop:s0 +persist.vendor.radio. u:object_r:vendor_rild_prop:s0 + diff --git a/legacy/whitechapel_pro/rfsd.te b/vendor/rfsd.te similarity index 100% rename from legacy/whitechapel_pro/rfsd.te rename to vendor/rfsd.te