From 68d67a0fd16f5167506429b3a8c14434943da264 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn <salyzyn@google.com> Date: Mon, 6 Jun 2016 12:18:46 -0700 Subject: [PATCH] logpersist: reserve persist.logd.logpersistd shell, system_app and logd access granted on debug builds only Bug: 28936216 Change-Id: Ib9648e8565cc0ea0077cf0950b0e4ac6fe0a3135 --- logd.te | 1 + property.te | 1 + property_contexts | 1 + shell.te | 1 + system_app.te | 1 + 5 files changed, 5 insertions(+) diff --git a/logd.te b/logd.te index 97bbd8be3..bc97a3754 100644 --- a/logd.te +++ b/logd.te @@ -28,6 +28,7 @@ set_prop(logd, powerctl_prop) # Access device logging gating property get_prop(logd, device_logging_prop) +userdebug_or_eng(`get_prop(logd, logpersistd_logging_prop)') r_dir_file(logd, domain) diff --git a/property.te b/property.te index 26d15ff40..6d3ba4f1c 100644 --- a/property.te +++ b/property.te @@ -23,6 +23,7 @@ type ctl_bugreport_prop, property_type; type ctl_console_prop, property_type; type audio_prop, property_type, core_property_type; type logd_prop, property_type, core_property_type; +type logpersistd_logging_prop, property_type; type mmc_prop, property_type; type restorecon_prop, property_type, core_property_type; type security_prop, property_type, core_property_type; diff --git a/property_contexts b/property_contexts index 06e9cc8b4..d48473b9b 100644 --- a/property_contexts +++ b/property_contexts @@ -42,6 +42,7 @@ persist.bluetooth. u:object_r:bluetooth_prop:s0 persist.debug. u:object_r:persist_debug_prop:s0 persist.logd. u:object_r:logd_prop:s0 persist.logd.security u:object_r:device_logging_prop:s0 +persist.logd.logpersistd u:object_r:logpersistd_logging_prop:s0 persist.log.tag u:object_r:logd_prop:s0 persist.mmc. u:object_r:mmc_prop:s0 persist.sys. u:object_r:system_prop:s0 diff --git a/shell.te b/shell.te index 610ed3ff7..c263f0ccd 100644 --- a/shell.te +++ b/shell.te @@ -63,6 +63,7 @@ set_prop(shell, ctl_dumpstate_prop) set_prop(shell, dumpstate_prop) set_prop(shell, debug_prop) set_prop(shell, powerctl_prop) +userdebug_or_eng(`set_prop(shell, logpersistd_logging_prop)') # systrace support - allow atrace to run allow shell debugfs_tracing:dir r_dir_perms; diff --git a/system_app.te b/system_app.te index 355f6d4a8..4c9c13629 100644 --- a/system_app.te +++ b/system_app.te @@ -29,6 +29,7 @@ set_prop(system_app, system_prop) set_prop(system_app, logd_prop) set_prop(system_app, net_radio_prop) set_prop(system_app, system_radio_prop) +userdebug_or_eng(`set_prop(system_app, logpersistd_logging_prop)') auditallow system_app net_radio_prop:property_service set; auditallow system_app system_radio_prop:property_service set; -- GitLab