Merge changes from topic "186500818-set1" into sc-dev

* changes:
  Let debugfs be accessed only for non-user builds
  Label debugfs files correctly
This commit is contained in:
TreeHugger Robot 2021-05-13 07:07:13 +00:00 committed by Android (Google) Code Review
commit 775771b811
3 changed files with 14 additions and 14 deletions

View file

@ -2,7 +2,6 @@ dump_hal(hal_telephony)
dump_hal(hal_graphics_composer)
userdebug_or_eng(`
allow dumpstate vendor_dmabuf_debugfs:file r_file_perms;
allow dumpstate media_rw_data_file:file append;
')

View file

@ -23,18 +23,18 @@ type vendor_misc_data_file, file_type, data_file_type;
type vendor_rpmbmock_data_file, file_type, data_file_type;
# Exynos debugfs
type vendor_ion_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_dmabuf_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_ion_debugfs, fs_type, debugfs_type;
type vendor_dmabuf_debugfs, fs_type, debugfs_type;
type vendor_mali_debugfs, fs_type, debugfs_type;
type vendor_dri_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_pm_genpd_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_regmap_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_usb_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_maxfg_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_charger_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_votable_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_battery_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_sjtag_debugfs, fs_type, debugfs_type, sysfs_type;
type vendor_dri_debugfs, fs_type, debugfs_type;
type vendor_pm_genpd_debugfs, fs_type, debugfs_type;
type vendor_regmap_debugfs, fs_type, debugfs_type;
type vendor_usb_debugfs, fs_type, debugfs_type;
type vendor_maxfg_debugfs, fs_type, debugfs_type;
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_sjtag_debugfs, fs_type, debugfs_type;
# Exynos sysfs
type sysfs_exynos_bts, sysfs_type, fs_type;

View file

@ -77,8 +77,6 @@ allow hal_dumpstate_default sysfs_chip_id:file r_file_perms;
allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans;
allow hal_dumpstate_default vendor_shell_exec:file execute_no_trans;
allow hal_dumpstate_default debugfs_f2fs:dir r_dir_perms;
allow hal_dumpstate_default debugfs_f2fs:file r_file_perms;
allow hal_dumpstate_default sysfs_scsi_devices_0000:dir r_dir_perms;
allow hal_dumpstate_default sysfs_scsi_devices_0000:file r_file_perms;
@ -135,6 +133,9 @@ userdebug_or_eng(`
allow hal_dumpstate_default sysfs_bcl:lnk_file read;
allow hal_dumpstate_default tcpdump_vendor_data_file:dir create_dir_perms;
allow hal_dumpstate_default tcpdump_vendor_data_file:file create_file_perms;
allow hal_dumpstate_default debugfs_f2fs:dir r_dir_perms;
allow hal_dumpstate_default debugfs_f2fs:file r_file_perms;
set_prop(hal_dumpstate_default, vendor_tcpdump_log_prop)
')