From aff9f380d301b6c6e5ae6d04f06c1035b7b5463c Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 24 Oct 2022 13:17:40 +0800 Subject: [PATCH 1/3] review ssr_detector_app Bug: 254378739 Test: boot with ssr app correctly labeled Change-Id: I28581c15cf0f7ecb01cbd11c747ad338b157e1c8 --- legacy/private/service_contexts | 1 - legacy/whitechapel_pro/file.te | 11 ----------- legacy/whitechapel_pro/genfs_contexts | 4 ---- legacy/whitechapel_pro/property.te | 2 -- legacy/whitechapel_pro/property_contexts | 8 -------- legacy/whitechapel_pro/seapp_contexts | 3 --- vendor/file.te | 11 +++++++++++ vendor/genfs_contexts | 4 ++++ vendor/property.te | 2 ++ vendor/property_contexts | 8 ++++++++ vendor/seapp_contexts | 2 ++ {legacy/whitechapel_pro => vendor}/ssr_detector.te | 0 12 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 legacy/private/service_contexts create mode 100644 vendor/genfs_contexts create mode 100644 vendor/seapp_contexts rename {legacy/whitechapel_pro => vendor}/ssr_detector.te (100%) diff --git a/legacy/private/service_contexts b/legacy/private/service_contexts deleted file mode 100644 index 8877518a..00000000 --- a/legacy/private/service_contexts +++ /dev/null @@ -1 +0,0 @@ -telephony.oem.oemrilhook u:object_r:radio_service:s0 diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index 20f386c2..f9ea082d 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -77,17 +77,6 @@ type modem_userdata_file, file_type; type sysfs_st33spi, sysfs_type, fs_type; typeattribute sysfs_st33spi mlstrustedobject; -# Vendor sched files -userdebug_or_eng(` - typeattribute proc_vendor_sched mlstrustedobject; -') - -# SJTAG -type sysfs_sjtag, fs_type, sysfs_type; -userdebug_or_eng(` - typeattribute sysfs_sjtag mlstrustedobject; -') - # USB-C throttling stats type sysfs_usbc_throttling_stats, sysfs_type, fs_type; diff --git a/legacy/whitechapel_pro/genfs_contexts b/legacy/whitechapel_pro/genfs_contexts index c6eecd3f..3bd00026 100644 --- a/legacy/whitechapel_pro/genfs_contexts +++ b/legacy/whitechapel_pro/genfs_contexts @@ -314,10 +314,6 @@ genfscon sysfs /thermal_zone14/mode u:obj genfscon sysfs /devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq u:object_r:sysfs_camera:s0 genfscon sysfs /devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq u:object_r:sysfs_camera:s0 -# SJTAG -genfscon sysfs /devices/platform/sjtag_ap/interface u:object_r:sysfs_sjtag:s0 -genfscon sysfs /devices/platform/sjtag_gsa/interface u:object_r:sysfs_sjtag:s0 - # USB-C throttling stats genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/cleared_time u:object_r:sysfs_usbc_throttling_stats:s0 genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/hysteresis_time u:object_r:sysfs_usbc_throttling_stats:s0 diff --git a/legacy/whitechapel_pro/property.te b/legacy/whitechapel_pro/property.te index 5d7f16ee..e817bb6a 100644 --- a/legacy/whitechapel_pro/property.te +++ b/legacy/whitechapel_pro/property.te @@ -3,8 +3,6 @@ vendor_internal_prop(vendor_slog_prop) vendor_internal_prop(vendor_persist_config_default_prop) vendor_internal_prop(vendor_cbd_prop) vendor_internal_prop(vendor_carrier_prop) -vendor_internal_prop(vendor_ssrdump_prop) -vendor_internal_prop(vendor_wifi_version) vendor_internal_prop(vendor_nfc_prop) vendor_internal_prop(vendor_secure_element_prop) vendor_internal_prop(vendor_battery_profile_prop) diff --git a/legacy/whitechapel_pro/property_contexts b/legacy/whitechapel_pro/property_contexts index d26b161d..bf2e8886 100644 --- a/legacy/whitechapel_pro/property_contexts +++ b/legacy/whitechapel_pro/property_contexts @@ -25,10 +25,6 @@ ro.vendor.config.build_carrier u:object_r:vendor_carrier_prop:s0 persist.vendor.config. u:object_r:vendor_persist_config_default_prop:s0 -# SSR Detector -vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 -persist.vendor.sys.ssr. u:object_r:vendor_ssrdump_prop:s0 - # test battery profile persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_prop:s0 @@ -41,10 +37,6 @@ persist.vendor.nfc. u:object_r:vendor_nfc_prop:s0 # SecureElement persist.vendor.se. u:object_r:vendor_secure_element_prop:s0 -# WiFi -vendor.wlan.driver.version u:object_r:vendor_wifi_version:s0 -vendor.wlan.firmware.version u:object_r:vendor_wifi_version:s0 - # for display ro.vendor.hwc.drm.device u:object_r:vendor_display_prop:s0 persist.vendor.display. u:object_r:vendor_display_prop:s0 diff --git a/legacy/whitechapel_pro/seapp_contexts b/legacy/whitechapel_pro/seapp_contexts index 72b0b6c9..f1082c60 100644 --- a/legacy/whitechapel_pro/seapp_contexts +++ b/legacy/whitechapel_pro/seapp_contexts @@ -48,9 +48,6 @@ user=_app isPrivApp=true seinfo=uwb name=com.qorvo.uwb.vendorservice domain=uwb_ # Domain for EuiccSupportPixel user=_app isPrivApp=true seinfo=EuiccSupportPixel name=com.google.euiccpixel domain=euiccpixel_app type=app_data_file levelFrom=all -# Sub System Ramdump -user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user - # Google Camera user=_app isPrivApp=true seinfo=google name=com.google.android.GoogleCamera domain=google_camera_app type=app_data_file levelFrom=all diff --git a/vendor/file.te b/vendor/file.te index 990bfbf7..3d5739d5 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -16,3 +16,14 @@ type vendor_fw_file, vendor_file_type, file_type; type modem_img_file, contextmount_type, file_type, vendor_file_type; allow modem_img_file self:filesystem associate; +# sysfs +type sysfs_sjtag, fs_type, sysfs_type; +userdebug_or_eng(` + typeattribute sysfs_sjtag mlstrustedobject; +') + +# Vendor sched files +userdebug_or_eng(` + typeattribute proc_vendor_sched mlstrustedobject; +') + diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts new file mode 100644 index 00000000..cdf5fc21 --- /dev/null +++ b/vendor/genfs_contexts @@ -0,0 +1,4 @@ +# SJTAG +genfscon sysfs /devices/platform/sjtag_ap/interface u:object_r:sysfs_sjtag:s0 +genfscon sysfs /devices/platform/sjtag_gsa/interface u:object_r:sysfs_sjtag:s0 + diff --git a/vendor/property.te b/vendor/property.te index 533301b4..29f53f12 100644 --- a/vendor/property.te +++ b/vendor/property.te @@ -1,2 +1,4 @@ vendor_internal_prop(vendor_modem_prop) vendor_internal_prop(vendor_rild_prop) +vendor_internal_prop(vendor_ssrdump_prop) +vendor_internal_prop(vendor_wifi_version) diff --git a/vendor/property_contexts b/vendor/property_contexts index 1d2fdaca..f24f8db5 100644 --- a/vendor/property_contexts +++ b/vendor/property_contexts @@ -14,3 +14,11 @@ 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 +# SSR Detector +vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 +persist.vendor.sys.ssr. u:object_r:vendor_ssrdump_prop:s0 + +# WiFi +vendor.wlan.driver.version u:object_r:vendor_wifi_version:s0 +vendor.wlan.firmware.version u:object_r:vendor_wifi_version:s0 + diff --git a/vendor/seapp_contexts b/vendor/seapp_contexts new file mode 100644 index 00000000..71b15ef6 --- /dev/null +++ b/vendor/seapp_contexts @@ -0,0 +1,2 @@ +# Sub System Ramdump +user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user diff --git a/legacy/whitechapel_pro/ssr_detector.te b/vendor/ssr_detector.te similarity index 100% rename from legacy/whitechapel_pro/ssr_detector.te rename to vendor/ssr_detector.te From 0fb88a6e5c0b96ce63eeaf08824237ffe3f90b4b Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 24 Oct 2022 14:14:12 +0800 Subject: [PATCH 2/3] review cbrs_setup_app Bug: 254378739 Test: boot with the app correctly labeled Change-Id: Ia0e63e7fc1a6b68ad1a7012e65b063f08f05470d --- legacy/whitechapel_pro/seapp_contexts | 3 --- {legacy/whitechapel_pro => vendor}/cbrs_setup.te | 0 vendor/seapp_contexts | 4 ++++ 3 files changed, 4 insertions(+), 3 deletions(-) rename {legacy/whitechapel_pro => vendor}/cbrs_setup.te (100%) diff --git a/legacy/whitechapel_pro/seapp_contexts b/legacy/whitechapel_pro/seapp_contexts index f1082c60..411f2575 100644 --- a/legacy/whitechapel_pro/seapp_contexts +++ b/legacy/whitechapel_pro/seapp_contexts @@ -38,9 +38,6 @@ user=_app isPrivApp=true seinfo=platform name=com.google.android.connectivitymon # Modem Diagnostic System user=_app isPrivApp=true seinfo=mds name=com.google.mds domain=modem_diagnostic_app type=app_data_file levelFrom=user -# CBRS setup app -user=_app seinfo=platform name=com.google.googlecbrs domain=cbrs_setup_app type=app_data_file levelFrom=user - # Qorvo UWB system app # TODO(b/222204912): Should this run under uwb user? user=_app isPrivApp=true seinfo=uwb name=com.qorvo.uwb.vendorservice domain=uwb_vendor_app type=uwb_vendor_data_file levelFrom=all diff --git a/legacy/whitechapel_pro/cbrs_setup.te b/vendor/cbrs_setup.te similarity index 100% rename from legacy/whitechapel_pro/cbrs_setup.te rename to vendor/cbrs_setup.te diff --git a/vendor/seapp_contexts b/vendor/seapp_contexts index 71b15ef6..54ee6ac0 100644 --- a/vendor/seapp_contexts +++ b/vendor/seapp_contexts @@ -1,2 +1,6 @@ # Sub System Ramdump user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user + +# CBRS setup app +user=_app seinfo=platform name=com.google.googlecbrs domain=cbrs_setup_app type=app_data_file levelFrom=user + From f652d07d61b5fd1501a16c1048f2a8e5e160816f Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 24 Oct 2022 14:30:52 +0800 Subject: [PATCH 3/3] review dmd and modem_logging_control Bug: 254378739 Test: boot with both of them launched Change-Id: I3402c89be55bb8258d0ceb8475cef9fb913d2604 --- legacy/whitechapel_pro/file.te | 2 -- legacy/whitechapel_pro/file_contexts | 3 --- legacy/whitechapel_pro/hwservice.te | 3 --- legacy/whitechapel_pro/hwservice_contexts | 3 --- legacy/whitechapel_pro/property.te | 3 --- legacy/whitechapel_pro/property_contexts | 13 ------------- {legacy/whitechapel_pro => vendor}/dmd.te | 0 vendor/file.te | 2 ++ vendor/file_contexts | 3 +++ vendor/hwservice.te | 3 +++ vendor/hwservice_contexts | 3 +++ .../modem_logging_control.te | 0 vendor/property.te | 3 +++ vendor/property_contexts | 12 ++++++++++++ 14 files changed, 26 insertions(+), 27 deletions(-) rename {legacy/whitechapel_pro => vendor}/dmd.te (100%) create mode 100644 vendor/hwservice.te create mode 100644 vendor/hwservice_contexts rename {legacy/whitechapel_pro => vendor}/modem_logging_control.te (100%) diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index f9ea082d..21f15844 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -2,7 +2,6 @@ type rild_vendor_data_file, file_type, data_file_type; type vendor_hwc_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 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; @@ -15,7 +14,6 @@ type uwb_data_vendor, file_type, data_file_type; type powerstats_vendor_data_file, file_type, data_file_type; userdebug_or_eng(` typeattribute tcpdump_vendor_data_file mlstrustedobject; - typeattribute vendor_slog_file mlstrustedobject; ') # sysfs diff --git a/legacy/whitechapel_pro/file_contexts b/legacy/whitechapel_pro/file_contexts index a34cc089..d8681295 100644 --- a/legacy/whitechapel_pro/file_contexts +++ b/legacy/whitechapel_pro/file_contexts @@ -1,6 +1,5 @@ # Binaries /vendor/bin/dmd u:object_r:dmd_exec:s0 -/vendor/bin/modem_logging_control u:object_r:modem_logging_control_exec:s0 /vendor/bin/sced u:object_r:sced_exec:s0 /vendor/bin/vcd u:object_r:vcd_exec:s0 /vendor/bin/chre u:object_r:chre_exec:s0 @@ -139,7 +138,6 @@ /dev/st21nfc u:object_r:nfc_device:s0 /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/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 @@ -176,7 +174,6 @@ /dev/block/platform/13200000\.ufs/by-name/vendor_kernel_boot_[ab] u:object_r:custom_ab_block_device:s0 # Data -/data/vendor/slog(/.*)? u:object_r:vendor_slog_file:s0 /data/vendor/modem_stat(/.*)? u:object_r:modem_stat_data_file:s0 /data/vendor/log/hwc(/.*)? u:object_r:vendor_hwc_log_file:s0 /data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 diff --git a/legacy/whitechapel_pro/hwservice.te b/legacy/whitechapel_pro/hwservice.te index 983e5a3f..5d7456ce 100644 --- a/legacy/whitechapel_pro/hwservice.te +++ b/legacy/whitechapel_pro/hwservice.te @@ -1,6 +1,3 @@ -# dmd servcie -type hal_vendor_oem_hwservice, hwservice_manager_type; - # GRIL service type hal_radioext_hwservice, hwservice_manager_type; diff --git a/legacy/whitechapel_pro/hwservice_contexts b/legacy/whitechapel_pro/hwservice_contexts index 0035ed49..9e820cf5 100644 --- a/legacy/whitechapel_pro/hwservice_contexts +++ b/legacy/whitechapel_pro/hwservice_contexts @@ -1,6 +1,3 @@ -# dmd HAL -vendor.samsung_slsi.telephony.hardware.oemservice::IOemService u:object_r:hal_vendor_oem_hwservice:s0 - # Fingerprint vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon u:object_r:hal_fingerprint_ext_hwservice:s0 diff --git a/legacy/whitechapel_pro/property.te b/legacy/whitechapel_pro/property.te index e817bb6a..1ca65bd6 100644 --- a/legacy/whitechapel_pro/property.te +++ b/legacy/whitechapel_pro/property.te @@ -1,6 +1,3 @@ -vendor_internal_prop(vendor_diag_prop) -vendor_internal_prop(vendor_slog_prop) -vendor_internal_prop(vendor_persist_config_default_prop) vendor_internal_prop(vendor_cbd_prop) vendor_internal_prop(vendor_carrier_prop) vendor_internal_prop(vendor_nfc_prop) diff --git a/legacy/whitechapel_pro/property_contexts b/legacy/whitechapel_pro/property_contexts index bf2e8886..b5f7fcdc 100644 --- a/legacy/whitechapel_pro/property_contexts +++ b/legacy/whitechapel_pro/property_contexts @@ -1,9 +1,3 @@ -# for dmd -persist.vendor.sys.dm. u:object_r:vendor_diag_prop:s0 -persist.vendor.sys.diag. u:object_r:vendor_diag_prop:s0 -vendor.sys.dmd. u:object_r:vendor_diag_prop:s0 -vendor.sys.diag. u:object_r:vendor_diag_prop:s0 - # Tcpdump_logger persist.vendor.tcpdump.log.alwayson u:object_r:vendor_tcpdump_log_prop:s0 vendor.tcpdump. u:object_r:vendor_tcpdump_log_prop:s0 @@ -12,19 +6,12 @@ vendor.tcpdump. u:object_r:vendor_tcpdump_log_prop:s0 persist.vendor.usb. u:object_r:vendor_usb_config_prop:s0 vendor.usb. u:object_r:vendor_usb_config_prop:s0 -# for slog -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 cbd vendor.cbd. u:object_r:vendor_cbd_prop:s0 persist.vendor.cbd. u:object_r:vendor_cbd_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 - # test battery profile persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_prop:s0 diff --git a/legacy/whitechapel_pro/dmd.te b/vendor/dmd.te similarity index 100% rename from legacy/whitechapel_pro/dmd.te rename to vendor/dmd.te diff --git a/vendor/file.te b/vendor/file.te index 3d5739d5..60c26a87 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -1,9 +1,11 @@ # Data type vendor_log_file, file_type, data_file_type; type vendor_rfsd_log_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; userdebug_or_eng(` typeattribute radio_vendor_data_file mlstrustedobject; + typeattribute vendor_slog_file mlstrustedobject; ') # Modem diff --git a/vendor/file_contexts b/vendor/file_contexts index ac39badf..6147047e 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -1,10 +1,12 @@ # Binaries /vendor/bin/rfsd u:object_r:rfsd_exec:s0 +/vendor/bin/modem_logging_control u:object_r:modem_logging_control_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 +/data/vendor/slog(/.*)? u:object_r:vendor_slog_file:s0 # vendor extra images /mnt/vendor/efs(/.*)? u:object_r:modem_efs_file:s0 @@ -15,6 +17,7 @@ /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 # Devices +/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 diff --git a/vendor/hwservice.te b/vendor/hwservice.te new file mode 100644 index 00000000..f6d18508 --- /dev/null +++ b/vendor/hwservice.te @@ -0,0 +1,3 @@ +# dmd servcie +type hal_vendor_oem_hwservice, hwservice_manager_type; + diff --git a/vendor/hwservice_contexts b/vendor/hwservice_contexts new file mode 100644 index 00000000..dd2a1fa6 --- /dev/null +++ b/vendor/hwservice_contexts @@ -0,0 +1,3 @@ +# dmd HAL +vendor.samsung_slsi.telephony.hardware.oemservice::IOemService u:object_r:hal_vendor_oem_hwservice:s0 + diff --git a/legacy/whitechapel_pro/modem_logging_control.te b/vendor/modem_logging_control.te similarity index 100% rename from legacy/whitechapel_pro/modem_logging_control.te rename to vendor/modem_logging_control.te diff --git a/vendor/property.te b/vendor/property.te index 29f53f12..68bb32a5 100644 --- a/vendor/property.te +++ b/vendor/property.te @@ -1,3 +1,6 @@ +vendor_internal_prop(vendor_slog_prop) +vendor_internal_prop(vendor_persist_config_default_prop) +vendor_internal_prop(vendor_diag_prop) vendor_internal_prop(vendor_modem_prop) vendor_internal_prop(vendor_rild_prop) vendor_internal_prop(vendor_ssrdump_prop) diff --git a/vendor/property_contexts b/vendor/property_contexts index f24f8db5..394172d7 100644 --- a/vendor/property_contexts +++ b/vendor/property_contexts @@ -1,3 +1,15 @@ +# for slog +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 dmd +persist.vendor.sys.dm. u:object_r:vendor_diag_prop:s0 +persist.vendor.sys.diag. u:object_r:vendor_diag_prop:s0 +vendor.sys.dmd. u:object_r:vendor_diag_prop:s0 +vendor.sys.diag. u:object_r:vendor_diag_prop:s0 +persist.vendor.config. u:object_r:vendor_persist_config_default_prop:s0 + # Modem persist.vendor.modem. u:object_r:vendor_modem_prop:s0 vendor.modem. u:object_r:vendor_modem_prop:s0