diff --git a/non_plat/adbd.te b/non_plat/adbd.te index a2bae62..b431979 100644 --- a/non_plat/adbd.te +++ b/non_plat/adbd.te @@ -11,5 +11,3 @@ allow adbd aee_dumpsys_data_file:file r_file_perms; allow adbd aee_exp_data_file:dir r_dir_perms; allow adbd aee_exp_data_file:file r_file_perms; allow adbd gpu_device:dir search; -allow adbd debuglog_data_file:dir r_dir_perms; -allow adbd debuglog_data_file:file r_file_perms; diff --git a/non_plat/connsyslogger.te b/non_plat/connsyslogger.te index fe41d13..36b700d 100755 --- a/non_plat/connsyslogger.te +++ b/non_plat/connsyslogger.te @@ -4,15 +4,11 @@ # ============================================== # Type Declaration # ============================================== -type connsyslogger,domain; -type connsyslogger_exec, system_file_type, exec_type, file_type; -typeattribute connsyslogger coredomain; # Purpose : for create hidl server #hal_server_domain(connsyslogger, mtk_hal_log) # ============================================== # MTK Policy Rule # ============================================== -init_daemon_domain(connsyslogger) #for logging sdcard access allow connsyslogger fuse:dir { create_dir_perms }; @@ -84,9 +80,4 @@ allow connsyslogger node:tcp_socket node_bind; # usb device ttyGSx for modem logger usb logging allow connsyslogger ttyGS_device:chr_file { rw_file_perms}; -#Date:2019/06/27 -#access data/debuglog -allow connsyslogger debuglog_data_file:dir {relabelto create_dir_perms}; -allow connsyslogger debuglog_data_file:file create_file_perms; - diff --git a/non_plat/file.te b/non_plat/file.te index 42305ea..95bf953 100644 --- a/non_plat/file.te +++ b/non_plat/file.te @@ -118,8 +118,6 @@ type logmisc_data_file, file_type, data_file_type, core_data_file_type; #mobilelog data/log_temp type logtemp_data_file, file_type, data_file_type, core_data_file_type; -type debuglog_data_file, file_type, data_file_type, core_data_file_type; - # NE core_forwarder type aee_core_data_file, file_type, data_file_type, core_data_file_type; type aee_core_vendor_file, file_type, data_file_type; diff --git a/non_plat/file_contexts b/non_plat/file_contexts index 0ae4894..5aef7cb 100644 --- a/non_plat/file_contexts +++ b/non_plat/file_contexts @@ -37,7 +37,6 @@ /data/extmdl(/.*)? u:object_r:mdlog_data_file:s0 #/data/http-proxy-cfg(/.*)? u:object_r:http_proxy_cfg_data_file:s0 /data/log_temp(/.*)? u:object_r:logtemp_data_file:s0 -/data/debuglogger(/.*)? u:object_r:debuglog_data_file:s0 #/data/lost\+found(/.*)? u:object_r:lost_found_data_file:s0 /data/mdlog(/.*)? u:object_r:mdlog_data_file:s0 /data/mdl(/.*)? u:object_r:mdlog_data_file:s0 diff --git a/non_plat/mobile_log_d.te b/non_plat/mobile_log_d.te index f6c22ff..6652567 100644 --- a/non_plat/mobile_log_d.te +++ b/non_plat/mobile_log_d.te @@ -59,9 +59,3 @@ allow mobile_log_d node:tcp_socket node_bind; # purpose: allow mobile_log_d to read system property init.svc.vendor. get_prop(mobile_log_d, vendor_default_prop) - -#data/debuglog -allow mobile_log_d debuglog_data_file:dir {relabelto create_dir_perms}; -allow mobile_log_d debuglog_data_file:file create_file_perms; -allow mobile_log_d system_data_file:dir create_dir_perms; -file_type_auto_trans(mobile_log_d, system_data_file, debuglog_data_file) diff --git a/non_plat/shell.te b/non_plat/shell.te index 2ab7e1b..b292564 100644 --- a/non_plat/shell.te +++ b/non_plat/shell.te @@ -18,8 +18,6 @@ allow shell aee_exp_vendor_file:dir r_dir_perms; allow shell aee_exp_vendor_file:file r_file_perms; allow shell aee_exp_data_file:dir r_dir_perms; allow shell aee_exp_data_file:file r_file_perms; -allow shell debuglog_data_file:dir r_dir_perms; -allow shell debuglog_data_file:file r_file_perms; get_prop(shell, mobile_log_prop) get_prop(shell, persist_mtk_aee_prop); diff --git a/plat_private/adbd.te b/plat_private/adbd.te new file mode 100644 index 0000000..9f78cb3 --- /dev/null +++ b/plat_private/adbd.te @@ -0,0 +1,2 @@ +allow adbd debuglog_data_file:dir r_dir_perms; +allow adbd debuglog_data_file:file r_file_perms; diff --git a/plat_private/connsyslogger.te b/plat_private/connsyslogger.te new file mode 100644 index 0000000..6048a29 --- /dev/null +++ b/plat_private/connsyslogger.te @@ -0,0 +1,8 @@ +typeattribute connsyslogger coredomain; +type connsyslogger_exec, system_file_type, exec_type, file_type; +init_daemon_domain(connsyslogger) + +#Date:2019/06/27 +#access data/debuglog +allow connsyslogger debuglog_data_file:dir {relabelto create_dir_perms}; +allow connsyslogger debuglog_data_file:file create_file_perms; diff --git a/plat_private/file.te b/plat_private/file.te index da41ba0..b999454 100755 --- a/plat_private/file.te +++ b/plat_private/file.te @@ -16,3 +16,5 @@ type access_sys_file, fs_type, sysfs_type; # Operation : Save modem db and filter into data partition # Purpose : For Modem db and filter file type mddb_filter_data_file, file_type, data_file_type, core_data_file_type; + +type debuglog_data_file, file_type, data_file_type, core_data_file_type; diff --git a/plat_private/file_contexts b/plat_private/file_contexts index e92e062..1fb08ca 100644 --- a/plat_private/file_contexts +++ b/plat_private/file_contexts @@ -3,6 +3,7 @@ # /data/system_de/mdfilter(/.*)? u:object_r:mddb_filter_data_file:s0 +/data/debuglogger(/.*)? u:object_r:debuglog_data_file:s0 ############################# # debugfs files # diff --git a/plat_private/mobile_log_d.te b/plat_private/mobile_log_d.te index d9567a8..ef7c7b6 100644 --- a/plat_private/mobile_log_d.te +++ b/plat_private/mobile_log_d.te @@ -75,3 +75,9 @@ allow mobile_log_d debugfs_tracing:dir create_dir_perms; #allow mobile_log_d debugfs_tracing:file create_file_perms; allow mobile_log_d debugfs_tracing_instances:dir create_dir_perms; allow mobile_log_d debugfs_tracing_instances:file create_file_perms; + +#data/debuglog +allow mobile_log_d debuglog_data_file:dir {relabelto create_dir_perms}; +allow mobile_log_d debuglog_data_file:file create_file_perms; +allow mobile_log_d system_data_file:dir create_dir_perms; +file_type_auto_trans(mobile_log_d, system_data_file, debuglog_data_file) diff --git a/plat_private/shell.te b/plat_private/shell.te new file mode 100644 index 0000000..ea00964 --- /dev/null +++ b/plat_private/shell.te @@ -0,0 +1,2 @@ +allow shell debuglog_data_file:dir r_dir_perms; +allow shell debuglog_data_file:file r_file_perms; diff --git a/plat_public/connsyslogger.te b/plat_public/connsyslogger.te new file mode 100644 index 0000000..142dfe1 --- /dev/null +++ b/plat_public/connsyslogger.te @@ -0,0 +1 @@ +type connsyslogger,domain;