From 36dc06e08ab0b29a48a091fa94572d10f9dd7cd9 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Thu, 20 Jan 2022 11:10:13 +0800 Subject: [PATCH] be able to dump debugfs info Bug: 208721677 Bug: 208909124 Test: do adb bugreport with no relevant error log Change-Id: I4f7fc7a8f0029f1c1f398403d938bd6b7b96a43e --- tracking_denials/hal_dumpstate_default.te | 25 +--------------- whitechapel_pro/file.te | 1 + whitechapel_pro/genfs_contexts | 1 + whitechapel_pro/hal_dumpstate_default.te | 35 +++++++++++++++++++++-- 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/tracking_denials/hal_dumpstate_default.te b/tracking_denials/hal_dumpstate_default.te index 8e88c4b2..40d89393 100644 --- a/tracking_denials/hal_dumpstate_default.te +++ b/tracking_denials/hal_dumpstate_default.te @@ -2,36 +2,13 @@ # b/208909124 dontaudit hal_dumpstate_default boottime_public_prop:file { open }; dontaudit hal_dumpstate_default boottime_public_prop:file { read }; -dontaudit hal_dumpstate_default debugfs:dir { open read }; -dontaudit hal_dumpstate_default debugfs_f2fs:dir { search }; -dontaudit hal_dumpstate_default debugfs_f2fs:file { open }; -dontaudit hal_dumpstate_default debugfs_f2fs:file { read }; -dontaudit hal_dumpstate_default debugfs:file { open }; -dontaudit hal_dumpstate_default debugfs:file { read }; dontaudit hal_dumpstate_default property_type:file *; dontaudit hal_dumpstate_default shell_data_file:file { getattr }; dontaudit hal_dumpstate_default sysfs:file { open }; dontaudit hal_dumpstate_default sysfs:file { read }; -dontaudit hal_dumpstate_default vendor_battery_debugfs:dir { open read }; -dontaudit hal_dumpstate_default vendor_battery_debugfs:dir search; -dontaudit hal_dumpstate_default vendor_battery_debugfs:file { getattr open read }; dontaudit hal_dumpstate_default vendor_camera_data_file:dir search; -dontaudit hal_dumpstate_default vendor_charger_debugfs:dir { open }; -dontaudit hal_dumpstate_default vendor_charger_debugfs:dir { read }; -dontaudit hal_dumpstate_default vendor_charger_debugfs:dir { search }; -dontaudit hal_dumpstate_default vendor_charger_debugfs:file { getattr }; -dontaudit hal_dumpstate_default vendor_charger_debugfs:file open; -dontaudit hal_dumpstate_default vendor_charger_debugfs:file { read }; -dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file { open }; -dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file { read }; dontaudit hal_dumpstate_default vendor_dumpsys:file { execute_no_trans }; dontaudit hal_dumpstate_default vendor_log_file:dir search; -dontaudit hal_dumpstate_default vendor_maxfg_debugfs:dir search; -dontaudit hal_dumpstate_default vendor_maxfg_debugfs:file { open read }; -dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file { open }; -dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file { read }; dontaudit hal_dumpstate_default vendor_shell_exec:file { execute_no_trans }; dontaudit hal_dumpstate_default vendor_toolbox_exec:file { execute_no_trans }; -dontaudit hal_dumpstate_default vendor_votable_debugfs:dir { open read }; -dontaudit hal_dumpstate_default vendor_votable_debugfs:dir search; -dontaudit hal_dumpstate_default vendor_votable_debugfs:file { getattr open read }; + diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index c72cba22..dfd0d49e 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -52,6 +52,7 @@ type vendor_charger_debugfs, fs_type, debugfs_type; type vendor_votable_debugfs, fs_type, debugfs_type; type vendor_battery_debugfs, fs_type, debugfs_type; type vendor_dmabuf_debugfs, fs_type, debugfs_type; +type vendor_dri_debugfs, fs_type, debugfs_type; # vendor extra images type modem_img_file, contextmount_type, file_type, vendor_file_type; diff --git a/whitechapel_pro/genfs_contexts b/whitechapel_pro/genfs_contexts index 9ab6242b..c2e10895 100644 --- a/whitechapel_pro/genfs_contexts +++ b/whitechapel_pro/genfs_contexts @@ -114,6 +114,7 @@ genfscon debugfs /usb u:object genfscon debugfs /google_charger u:object_r:vendor_charger_debugfs:s0 genfscon debugfs /gvotables u:object_r:vendor_votable_debugfs:s0 genfscon debugfs /google_battery u:object_r:vendor_battery_debugfs:s0 +genfscon debugfs /dri/0/crtc- u:object_r:vendor_dri_debugfs:s0 # Battery genfscon sysfs /devices/platform/google,battery/power_supply/battery u:object_r:sysfs_batteryinfo:s0 diff --git a/whitechapel_pro/hal_dumpstate_default.te b/whitechapel_pro/hal_dumpstate_default.te index 0de4e15b..88e7def3 100644 --- a/whitechapel_pro/hal_dumpstate_default.te +++ b/whitechapel_pro/hal_dumpstate_default.te @@ -69,8 +69,37 @@ userdebug_or_eng(` allow hal_dumpstate_default ramdump_vendor_mnt_file:file r_file_perms; allow hal_dumpstate_default sysfs_bcl:dir r_dir_perms; allow hal_dumpstate_default sysfs_bcl:file r_file_perms; - + allow hal_dumpstate_default debugfs:dir r_dir_perms; + allow hal_dumpstate_default vendor_votable_debugfs:dir r_dir_perms; + allow hal_dumpstate_default vendor_votable_debugfs:file r_file_perms; + allow hal_dumpstate_default debugfs_f2fs:dir r_dir_perms; + allow hal_dumpstate_default debugfs_f2fs:file r_file_perms; + allow hal_dumpstate_default vendor_battery_debugfs:dir r_dir_perms; + allow hal_dumpstate_default vendor_battery_debugfs:file r_file_perms; + allow hal_dumpstate_default vendor_charger_debugfs:dir r_dir_perms; + allow hal_dumpstate_default vendor_charger_debugfs:file r_file_perms; + allow hal_dumpstate_default vendor_dmabuf_debugfs:file r_file_perms; + allow hal_dumpstate_default vendor_maxfg_debugfs:dir r_dir_perms; + allow hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms; + allow hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms; + allow hal_dumpstate_default vendor_dri_debugfs:dir r_dir_perms; + allow hal_dumpstate_default vendor_dri_debugfs:file r_file_perms; ') -dontaudit hal_dumpstate_default sysfs_bcl:dir { open }; -dontaudit hal_dumpstate_default sysfs_bcl:file { read }; +dontaudit hal_dumpstate_default vendor_dri_debugfs:dir r_dir_perms; +dontaudit hal_dumpstate_default vendor_dri_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default debugfs:dir r_dir_perms; +dontaudit hal_dumpstate_default vendor_votable_debugfs:dir r_dir_perms; +dontaudit hal_dumpstate_default vendor_votable_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default debugfs_f2fs:dir r_dir_perms; +dontaudit hal_dumpstate_default debugfs_f2fs:file r_file_perms; +dontaudit hal_dumpstate_default vendor_battery_debugfs:dir r_dir_perms; +dontaudit hal_dumpstate_default vendor_battery_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default vendor_charger_debugfs:dir r_dir_perms; +dontaudit hal_dumpstate_default vendor_charger_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default vendor_dmabuf_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default vendor_maxfg_debugfs:dir r_dir_perms; +dontaudit hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms; +dontaudit hal_dumpstate_default sysfs_bcl:dir r_dir_perms; +dontaudit hal_dumpstate_default sysfs_bcl:file r_file_perms;