From 86b6fcc8a6fdef2551c76b683d257605b6c54a22 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Tue, 20 Jun 2017 14:53:34 -0700 Subject: [PATCH] Move /data/misc/radio to /data/vendor/radio as per treble rules 1) Modify the sepolicy to use /data/vendor partition to hold vendor radio data. 2) Modify Dumpstate to access /data/vendor for logging. Test: Basic telephony sanity with radio enforce mode Bug: 36736902 Bug: 36717606 Change-Id: I1f8f1026189c1262cfe0af251451e0efcc98c7f7 --- dumpstate/DumpstateDevice.cpp | 4 ++-- sepolicy/vendor/file_contexts | 1 - sepolicy/vendor/init_radio.te | 4 ++-- sepolicy/vendor/rild.te | 3 +++ sepolicy/vendor/smlog_dump.te | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index b78def7a..25052e57 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -65,8 +65,8 @@ void DumpstateDevice::dumpModem(int fd, int fdModem) std::string diagLogDir = "/data/vendor/radio/diag_logs/logs"; std::vector rilAndNetmgrLogs { - "/data/misc/radio/ril_log", - "/data/misc/radio/ril_log_old", + "/data/vendor/radio/ril_log", + "/data/vendor/radio/ril_log_old", "/data/vendor/netmgr/netmgr_log", "/data/vendor/netmgr/netmgr_log_old" }; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 0be05a1d..e0061fc3 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -289,7 +289,6 @@ /vendor/lib/dsp/fastrpc_shell_0 u:object_r:hexagon_halide_file:s0 # data files -/data/misc/radio(/.*)? u:object_r:radio_data_file:s0 /data/vendor/netmgr(/.*)? u:object_r:netmgr_data_file:s0 /data/vendor/location(/.*)? u:object_r:location_data_file:s0 /data/ramdump(/.*)? u:object_r:ramdump_data_file:s0 diff --git a/sepolicy/vendor/init_radio.te b/sepolicy/vendor/init_radio.te index 34c31ea5..ff4da345 100644 --- a/sepolicy/vendor/init_radio.te +++ b/sepolicy/vendor/init_radio.te @@ -7,5 +7,5 @@ init_daemon_domain(init_radio) allow init_radio vendor_shell_exec:file rx_file_perms; allow init_radio vendor_toolbox_exec:file rx_file_perms; -allow init_radio radio_data_file:dir create_dir_perms; -allow init_radio radio_data_file:file create_file_perms; +allow init_radio radio_vendor_data_file:dir create_dir_perms; +allow init_radio radio_vendor_data_file:file create_file_perms; diff --git a/sepolicy/vendor/rild.te b/sepolicy/vendor/rild.te index 5ef012ba..15d084ce 100644 --- a/sepolicy/vendor/rild.te +++ b/sepolicy/vendor/rild.te @@ -22,3 +22,6 @@ allow rild time_daemon:unix_stream_socket connectto; userdebug_or_eng(` domain_auto_trans(rild, smlog_dump_exec, smlog_dump) ') + +allow rild radio_vendor_data_file:dir rw_dir_perms; +allow rild radio_vendor_data_file:file create_file_perms; diff --git a/sepolicy/vendor/smlog_dump.te b/sepolicy/vendor/smlog_dump.te index ece406b7..bc8d94b4 100644 --- a/sepolicy/vendor/smlog_dump.te +++ b/sepolicy/vendor/smlog_dump.te @@ -8,7 +8,7 @@ userdebug_or_eng(` r_dir_file(smlog_dump, sysfs_rmtfs) allow smlog_dump diag_device:chr_file rw_file_perms; - allow smlog_dump radio_data_file:file { append read write }; + allow smlog_dump radio_vendor_data_file:file { append read write }; allow smlog_dump rild:fd use; allow smlog_dump rild:fifo_file { read write }; allow smlog_dump rild:unix_stream_socket { read write };