From c3048691a96463d6369fe15413950f2e87275994 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Tue, 7 Feb 2023 08:29:27 +0000 Subject: [PATCH] WLC: Fix hal_wireless_charger sepolicies Bug: 264483390 Bug: 264483533 Bug: 264483152 Bug: 263429589 Change-Id: If06e0b0c429e78e71f7be2d6418ccab0ab115414 Signed-off-by: Ken Yang --- tracking_denials/bug_map | 5 +---- tracking_denials/hal_wireless_charger.te | 9 --------- vendor/dumpstate.te | 4 +++- vendor/hal_wireless_charger.te | 3 +++ vendor/shell.te | 2 ++ 5 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 tracking_denials/hal_wireless_charger.te create mode 100644 vendor/shell.te diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map index 3b964e9f..e2f69f36 100644 --- a/tracking_denials/bug_map +++ b/tracking_denials/bug_map @@ -5,7 +5,6 @@ con_monitor_app dalvikcache_data_file file b/264483670 con_monitor_app mnt_expand_file dir b/264483670 con_monitor_app system_data_file lnk_file b/264483670 dumpstate app_zygote process b/264483390 -dumpstate hal_wireless_charger binder b/264483390 google_camera_app audio_service service_manager b/264600171 google_camera_app backup_service service_manager b/264483456 google_camera_app legacy_permission_service service_manager b/264600171 @@ -24,8 +23,7 @@ hal_usb_impl hal_thermal_hwservice hwservice_manager b/264482981 hal_usb_impl hal_thermal_hwservice hwservice_manager b/264600052 hal_usb_impl hidl_manager_hwservice hwservice_manager b/264482981 hal_usb_impl hidl_manager_hwservice hwservice_manager b/264600052 -hal_wireless_charger dumpstate fd b/264483533 -hal_wireless_charger dumpstate fifo_file b/264483533 +hal_vibrator_default aac_drc_prop file b/264483356 logger_app radio_vendor_data_file file b/264600084 logger_app vendor_logger_prop file b/264600053 logger_app vendor_modem_prop property_service b/264600053 @@ -35,7 +33,6 @@ pixelstats_vendor sysfs_pixelstats file b/264483319 pixelstats_vendor sysfs_pixelstats file b/264483568 platform_app bootanim_system_prop property_service b/264483532 servicemanager hal_fingerprint_default binder b/264483753 -shell sysfs_wlc dir b/264483152 ssr_detector_app system_app_data_file dir b/264483352 ssr_detector_app system_app_data_file file b/264483352 system_server default_android_service service_manager b/264483754 diff --git a/tracking_denials/hal_wireless_charger.te b/tracking_denials/hal_wireless_charger.te deleted file mode 100644 index aa9faf20..00000000 --- a/tracking_denials/hal_wireless_charger.te +++ /dev/null @@ -1,9 +0,0 @@ -# b/263429589 -dontaudit hal_wireless_charger sysfs:file { getattr }; -dontaudit hal_wireless_charger sysfs:file { open }; -dontaudit hal_wireless_charger sysfs:file { read }; -dontaudit hal_wireless_charger sysfs:file { write }; -# b/264489610 -userdebug_or_eng(` - permissive hal_wireless_charger; -') \ No newline at end of file diff --git a/vendor/dumpstate.te b/vendor/dumpstate.te index 0c736649..e4c18d33 100644 --- a/vendor/dumpstate.te +++ b/vendor/dumpstate.te @@ -3,4 +3,6 @@ dump_hal(hal_graphics_composer) dump_hal(hal_health) -dump_hal(hal_uwb) +binder_call(dumpstate, hal_wireless_charger) + +dump_hal(hal_uwb) \ No newline at end of file diff --git a/vendor/hal_wireless_charger.te b/vendor/hal_wireless_charger.te index 04b3e5e2..b22f2e3a 100644 --- a/vendor/hal_wireless_charger.te +++ b/vendor/hal_wireless_charger.te @@ -1,2 +1,5 @@ type hal_wireless_charger, domain; type hal_wireless_charger_exec, exec_type, vendor_file_type, file_type; + +allow hal_wireless_charger dumpstate:fd use; +allow hal_wireless_charger dumpstate:fifo_file rw_file_perms; diff --git a/vendor/shell.te b/vendor/shell.te new file mode 100644 index 00000000..adc4eb6a --- /dev/null +++ b/vendor/shell.te @@ -0,0 +1,2 @@ +# wlc +dontaudit shell sysfs_wlc:dir search; \ No newline at end of file