From 8c7514adb1b08cf24c7881956d8e0895c233b7be Mon Sep 17 00:00:00 2001 From: Andreas Gampe <agampe@google.com> Date: Wed, 19 Apr 2017 17:10:02 -0700 Subject: [PATCH] Sepolicy: Give asan_extract access to powerctl rc-style powerctl has beem removed. Accordingly, asan_extract now needs access to sys.powerctl directly. (orginally commit: 8267208921a6240b438f2cf65e043c11ebce1a8b) Bug: 36458146 Bug: 38241921 Test: Builds and boots. Change-Id: I7d6e583f5e98b671986a2071abf157c86e288a10 --- prebuilts/api/26.0/26.0.cil | 1 + private/property_contexts | 3 --- public/asan_extract.te | 6 +----- public/property.te | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/prebuilts/api/26.0/26.0.cil b/prebuilts/api/26.0/26.0.cil index 3ebaa040e..8e9a08ce1 100644 --- a/prebuilts/api/26.0/26.0.cil +++ b/prebuilts/api/26.0/26.0.cil @@ -2,6 +2,7 @@ (typeattributeset domain_deprecated (bluetooth_26_0)) ;; types removed from current policy +(type asan_reboot_prop) (type log_device) (typeattributeset accessibility_service_26_0 (accessibility_service)) diff --git a/private/property_contexts b/private/property_contexts index 3ca1d7064..8eb2f28b2 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -112,6 +112,3 @@ wlan. u:object_r:wifi_prop:s0 # hwservicemanager properties hwservicemanager. u:object_r:hwservicemanager_prop:s0 - -# ASAN install trigger -asan.restore_reboot u:object_r:asan_reboot_prop:s0 diff --git a/public/asan_extract.te b/public/asan_extract.te index 46b755776..15c5a09fd 100644 --- a/public/asan_extract.te +++ b/public/asan_extract.te @@ -31,10 +31,6 @@ with_asan(` # Restorecon will actually already try to run with sanitized libraries (libpackagelistparser). allow asan_extract system_data_file:file execute; - # TODO - remove (b/38241921): - # We use asan.restore_reboot to signal a reboot is required. - set_prop(asan_extract, asan_reboot_prop) - - # We need to signal a reboot when done + # We need to signal a reboot when done. set_prop(asan_extract, powerctl_prop) ') diff --git a/public/property.te b/public/property.te index 4cc270131..95efcaa78 100644 --- a/public/property.te +++ b/public/property.te @@ -1,4 +1,3 @@ -type asan_reboot_prop, property_type; # TODO - remove (b/38241921) type audio_prop, property_type, core_property_type; type boottime_prop, property_type; type bluetooth_prop, property_type; -- GitLab