From ee0c81fbc62e528fa28c291e520d19ca9e53ecf8 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Thu, 2 Sep 2021 11:34:58 +0800 Subject: [PATCH] review modem_svc_sit Bug: 198532074 Test: boot with modem_svc_sit started Change-Id: I3018491564eb3bb5dafc5e9ad6446f353d54b18b --- legacy/file.te | 4 ---- legacy/file_contexts | 4 ---- legacy/genfs_contexts | 3 --- whitechapel_pro/file.te | 1 + whitechapel_pro/file_contexts | 2 ++ {legacy => whitechapel_pro}/modem_svc_sit.te | 3 --- 6 files changed, 3 insertions(+), 14 deletions(-) rename {legacy => whitechapel_pro}/modem_svc_sit.te (91%) diff --git a/legacy/file.te b/legacy/file.te index 6ba99f7f..f0920be4 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -82,10 +82,6 @@ type sysfs_touch, sysfs_type, fs_type; # RILD type rild_vendor_data_file, file_type, data_file_type; -# Modem -type modem_stat_data_file, file_type, data_file_type; -type sysfs_modem, sysfs_type, fs_type; - # TCP logging type tcpdump_vendor_data_file, file_type, data_file_type, mlstrustedobject; diff --git a/legacy/file_contexts b/legacy/file_contexts index 6d0c5cef..1a683e76 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -204,10 +204,6 @@ /vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0 /data/vendor/tcpdump_logger(/.*)? u:object_r:tcpdump_vendor_data_file:s0 -# modem_svc_sit files -/vendor/bin/modem_svc_sit u:object_r:modem_svc_sit_exec:s0 -/data/vendor/modem_stat/debug\.txt u:object_r:modem_stat_data_file:s0 - # Kernel modules related /vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0 diff --git a/legacy/genfs_contexts b/legacy/genfs_contexts index 01de590b..e5ff5673 100644 --- a/legacy/genfs_contexts +++ b/legacy/genfs_contexts @@ -112,9 +112,6 @@ genfscon sysfs /devices/platform/1c2d0000.drmdsim/hs_clock # Display / LHBM (Local High Brightness Mode) genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/backlight/panel0-backlight/local_hbm_mode u:object_r:sysfs_lhbm:s0 -# Modem -genfscon sysfs /devices/platform/cp-tm1/cp_temp u:object_r:sysfs_modem:s0 - # Bluetooth genfscon sysfs /devices/platform/175b0000.serial/serial0/serial0-0/bluetooth/hci0/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0 genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0 diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index 69acff6e..07ea9e8b 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -1,4 +1,5 @@ # Data +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; userdebug_or_eng(` diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 9a60b68e..4f32b619 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -5,6 +5,7 @@ /vendor/bin/vcd u:object_r:vcd_exec:s0 /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 Firmwares /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 @@ -26,6 +27,7 @@ # Data /data/vendor/slog(/.*)? u:object_r:vendor_slog_file:s0 /data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0 +/data/vendor/modem_stat/debug\.txt u:object_r:modem_stat_data_file:s0 # Persist /mnt/vendor/persist/modem(/.*)? u:object_r:persist_modem_file:s0 diff --git a/legacy/modem_svc_sit.te b/whitechapel_pro/modem_svc_sit.te similarity index 91% rename from legacy/modem_svc_sit.te rename to whitechapel_pro/modem_svc_sit.te index eeba9976..0b872264 100644 --- a/legacy/modem_svc_sit.te +++ b/whitechapel_pro/modem_svc_sit.te @@ -5,9 +5,6 @@ init_daemon_domain(modem_svc_sit) hwbinder_use(modem_svc_sit) binder_call(modem_svc_sit, rild) -# Grant sysfs_modem access -allow modem_svc_sit sysfs_modem:file rw_file_perms; - # Grant radio device access allow modem_svc_sit radio_device:chr_file rw_file_perms;