Merge changes from topic "b180760068" into sc-dev

* changes:
  genfs_contexts: add sscoredump per-subsystem policies
  vendor: remove sscoredump policies
This commit is contained in:
Oleg Matcovschi 2021-03-29 22:05:23 +00:00 committed by Android (Google) Code Review
commit 3872f8015f
5 changed files with 8 additions and 38 deletions

View file

@ -48,9 +48,6 @@ type vframe_heap_device, dmabuf_heap_device_type, dev_type;
#vscaler-secure DMA-BUF heap
type vscaler_heap_device, dmabuf_heap_device_type, dev_type;
# subsystem-coredump
type sscoredump_device, dev_type;
# AOC device
type aoc_device, dev_type;

View file

@ -66,7 +66,6 @@ type sysfs_iommu, sysfs_type, fs_type;
type sysfs_devicetree, sysfs_type, fs_type;
type sysfs_mem, sysfs_type, fs_type;
type sysfs_sscoredump_level, sysfs_type, fs_type;
# WiFi
type sysfs_wifi, sysfs_type, fs_type;
@ -77,10 +76,6 @@ type updated_wifi_firmware_data_file, file_type, data_file_type;
# Widevine DRM
type mediadrm_vendor_data_file, file_type, data_file_type;
# Subsystem coredump
type sscoredump_vendor_data_coredump_file, file_type, data_file_type, mlstrustedobject;
type sscoredump_vendor_data_crashinfo_file, file_type, data_file_type, mlstrustedobject;
# Storage Health HAL
type sysfs_scsi_devices_0000, sysfs_type, fs_type;
type debugfs_f2fs, debugfs_type, fs_type;
@ -172,9 +167,6 @@ type sysfs_chosen, sysfs_type, fs_type;
type sysfs_chip_id, sysfs_type, fs_type;
type sysfs_spi, sysfs_type, fs_type;
# subsystem-coredump
type sscoredump_sysfs_level, sysfs_type, fs_type;
# Battery
type persist_battery_file, file_type, vendor_persist_type;

View file

@ -259,13 +259,6 @@
/mnt/vendor/modem_userdata(/.*)? u:object_r:modem_userdata_file:s0
/mnt/vendor/persist/modem(/.*)? u:object_r:persist_modem_file:s0
# Subsystem coredump
/vendor/bin/sscoredump u:object_r:sscoredump_exec:s0
/data/vendor/ssrdump(/.*)? u:object_r:sscoredump_vendor_data_crashinfo_file:s0
/data/vendor/ssrdump/coredump(/.*)? u:object_r:sscoredump_vendor_data_coredump_file:s0
/dev/sscd_.* u:object_r:sscoredump_device:s0
# Kernel modules related
/vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0

View file

@ -186,9 +186,6 @@ genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-6/6-0069/power_supply/main-c
# OTA
genfscon sysfs /devices/platform/14700000.ufs/pixel/boot_lun_enabled u:object_r:sysfs_ota:s0
# subsystem-coredump
genfscon sysfs /class/sscoredump/level u:object_r:sscoredump_sysfs_level:s0
# ACPM
genfscon sysfs /devices/platform/acpm_stats u:object_r:sysfs_acpm_stats:s0
@ -238,3 +235,11 @@ genfscon debugfs /google_battery
# tracefs
genfscon tracefs /events/dmabuf_heap/dma_heap_stat u:object_r:debugfs_tracing:s0
# sscoredump (per device)
genfscon sysfs /devices/platform/abrolhos/sscoredump/sscd_abrolhos/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0
genfscon sysfs /devices/platform/aoc/sscoredump/sscd_aoc/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0
genfscon sysfs /devices/platform/bigocean/sscoredump/sscd_bigocean/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0
genfscon sysfs /devices/platform/debugcore/sscoredump/sscd_debugcore/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0
genfscon sysfs /devices/platform/mfc-core/sscoredump/sscd_mfc-core/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0
genfscon sysfs /devices/platform/wlan/sscoredump/sscd_wlan/report_count u:object_r:sysfs_sscoredump_subsystem_report_count:s0

View file

@ -1,17 +0,0 @@
type sscoredump, domain;
type sscoredump_exec, vendor_file_type, exec_type, file_type;
init_daemon_domain(sscoredump)
set_prop(sscoredump, vendor_ssrdump_prop)
allow sscoredump device:dir r_dir_perms;
allow sscoredump sscoredump_device:chr_file rw_file_perms;
allow sscoredump sscoredump_vendor_data_crashinfo_file:dir create_dir_perms;
allow sscoredump sscoredump_vendor_data_crashinfo_file:file create_file_perms;
userdebug_or_eng(`
allow sscoredump sscoredump_sysfs_level:file rw_file_perms;
allow sscoredump sscoredump_vendor_data_coredump_file:dir create_dir_perms;
allow sscoredump sscoredump_vendor_data_coredump_file:file create_file_perms;
')