diff --git a/legacy/file.te b/legacy/file.te index 5a688010..1f73ec66 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -59,9 +59,6 @@ type per_boot_file, file_type, data_file_type, core_data_file_type; type proc_touch, proc_type, fs_type, mlstrustedobject; type sysfs_touch, sysfs_type, fs_type; -# TCP logging -type tcpdump_vendor_data_file, file_type, data_file_type, mlstrustedobject; - # Wireless type sysfs_wlc, sysfs_type, fs_type; diff --git a/legacy/file_contexts b/legacy/file_contexts index a0c15b01..650a1858 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -115,10 +115,6 @@ # Contexthub /vendor/bin/hw/android\.hardware\.contexthub-service\.generic u:object_r:hal_contexthub_default_exec:s0 -# TCP logging -/vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0 -/data/vendor/tcpdump_logger(/.*)? u:object_r:tcpdump_vendor_data_file:s0 - # Kernel modules related /vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0 diff --git a/legacy/property.te b/legacy/property.te index fb13217c..465c1b11 100644 --- a/legacy/property.te +++ b/legacy/property.te @@ -16,8 +16,5 @@ vendor_internal_prop(vendor_logger_prop) # Touchpanel vendor_internal_prop(vendor_touchpanel_prop) -# TCP logging -vendor_internal_prop(vendor_tcpdump_log_prop) - # Fingerprint vendor_internal_prop(vendor_fingerprint_fake_prop) diff --git a/legacy/property_contexts b/legacy/property_contexts index b96a8fff..dfdea23f 100644 --- a/legacy/property_contexts +++ b/legacy/property_contexts @@ -30,11 +30,5 @@ vendor.gps u:object_r:vendor_gps_prop:s0 # Touchpanel vendor.mfgapi.touchpanel.permission u:object_r:vendor_touchpanel_prop:s0 -# Tcpdump_logger -persist.vendor.tcpdump.log.alwayson u:object_r:vendor_tcpdump_log_prop:s0 -vendor.tcpdump.log.ondemand u:object_r:vendor_tcpdump_log_prop:s0 -vendor.tcpdump.log.alwayson u:object_r:vendor_tcpdump_log_prop:s0 -vendor.tcpdump.output.dir u:object_r:vendor_tcpdump_log_prop:s0 - # Fingerprint vendor.fingerprint.disable.fake u:object_r:vendor_fingerprint_fake_prop:s0 diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index e2368190..5904ff5d 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -6,7 +6,9 @@ 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; userdebug_or_eng(` + typeattribute tcpdump_vendor_data_file mlstrustedobject; typeattribute vendor_slog_file mlstrustedobject; typeattribute radio_vendor_data_file mlstrustedobject; ') diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index b3c9348f..094d339b 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -6,18 +6,19 @@ /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/hw/rild_exynos u:object_r:rild_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 +/vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-service-gto u:object_r:hal_secure_element_gto_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-service-gto-ese2 u:object_r:hal_secure_element_gto_ese2_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-uicc-service u:object_r:hal_secure_element_uicc_exec:s0 -/vendor/bin/storageproxyd u:object_r:tee_exec:s0 -/vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.goodix u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.nfc@1\.2-service\.st u:object_r:hal_nfc_default_exec:s0 /vendor/bin/hw/vendor\.google\.wireless_charger@1\.3-service-vendor u:object_r:hal_wlc_exec:s0 /vendor/bin/hw/android\.hardware\.usb@1\.3-service\.gs201 u:object_r:hal_usb_impl_exec:s0 +/vendor/bin/hw/rild_exynos u:object_r:rild_exec:s0 # Vendor Firmwares /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 @@ -82,6 +83,7 @@ /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 /data/nfc(/.*)? u:object_r:nfc_data_file:s0 /data/vendor/firmware/wifi(/.*)? u:object_r:updated_wifi_firmware_data_file:s0 +/data/vendor/tcpdump_logger(/.*)? u:object_r:tcpdump_vendor_data_file:s0 # Persist /mnt/vendor/persist/modem(/.*)? u:object_r:persist_modem_file:s0 diff --git a/whitechapel_pro/property.te b/whitechapel_pro/property.te index cfff8cd5..56d2ed93 100644 --- a/whitechapel_pro/property.te +++ b/whitechapel_pro/property.te @@ -13,4 +13,5 @@ vendor_internal_prop(vendor_battery_profile_prop) vendor_internal_prop(vendor_battery_defender_prop) vendor_internal_prop(vendor_camera_prop) vendor_internal_prop(vendor_usb_config_prop) +vendor_internal_prop(vendor_tcpdump_log_prop) diff --git a/whitechapel_pro/property_contexts b/whitechapel_pro/property_contexts index 7bb71c66..8aa7d100 100644 --- a/whitechapel_pro/property_contexts +++ b/whitechapel_pro/property_contexts @@ -4,6 +4,10 @@ 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 + # USB HAL persist.vendor.usb. u:object_r:vendor_usb_config_prop:s0 vendor.usb. u:object_r:vendor_usb_config_prop:s0 diff --git a/legacy/tcpdump_logger.te b/whitechapel_pro/tcpdump_logger.te similarity index 100% rename from legacy/tcpdump_logger.te rename to whitechapel_pro/tcpdump_logger.te