From 30dd7111576f0e3107b647cbb61f7a6ef41fe74c Mon Sep 17 00:00:00 2001 From: Tom Cherry <tomcherry@google.com> Date: Tue, 23 Oct 2018 13:25:05 -0700 Subject: [PATCH] Combine vendor-init-actionable with vendor-init-readable Historically, vendor-init-actionable was created since the various property_contexts files were not yet available when init parses its scripts. Since then, the property_contexts files are now always available when init parses its scripts, so we can collapse these two categories. Specifically, this change ensures that all of the properties in the previous 'stable_properties.h' file in init, which contained the vendor-init-actionable properties, are able to be read by init according to SEPolicy. Bug: 71814576 Test: vendor_init fails to use non-readable properties as a trigger Test: vendor_init successfully uses readable properties as a trigger Change-Id: Ic6d9919b6047f3076a1a19fc26295c6a77aca627 --- private/property_contexts | 2 ++ public/property_contexts | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/private/property_contexts b/private/property_contexts index b0f865375..58cc9832b 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -156,6 +156,8 @@ odm. u:object_r:vendor_default_prop:s0 persist.odm. u:object_r:vendor_default_prop:s0 persist.vendor. u:object_r:vendor_default_prop:s0 vendor. u:object_r:vendor_default_prop:s0 +# ro.boot. properties are set based on kernel commandline arguments, which are vendor owned. +ro.boot. u:object_r:exported2_default_prop:s0 # Properties that relate to time / time zone detection behavior. persist.time. u:object_r:time_prop:s0 diff --git a/public/property_contexts b/public/property_contexts index 87a81d746..492b68144 100644 --- a/public/property_contexts +++ b/public/property_contexts @@ -70,6 +70,7 @@ media.stagefright.cache-params u:object_r:exported3_default_prop:s0 exact string media.stagefright.thumbnail.prefer_hw_codecs u:object_r:exported3_default_prop:s0 exact bool persist.bluetooth.a2dp_offload.cap u:object_r:bluetooth_a2dp_offload_prop:s0 exact string persist.bluetooth.a2dp_offload.disabled u:object_r:bluetooth_a2dp_offload_prop:s0 exact bool +persist.bluetooth.btsnoopenable u:object_r:exported_bluetooth_prop:s0 exact bool persist.config.calibration_fac u:object_r:exported3_default_prop:s0 exact string persist.dbg.volte_avail_ovr u:object_r:exported3_default_prop:s0 exact int persist.dbg.vt_avail_ovr u:object_r:exported3_default_prop:s0 exact int @@ -137,20 +138,25 @@ sendbug.preferred.domain u:object_r:exported3_default_prop:s0 exact string sys.usb.controller u:object_r:exported2_system_prop:s0 exact string sys.usb.ffs.max_read u:object_r:exported_ffs_prop:s0 exact int sys.usb.ffs.max_write u:object_r:exported_ffs_prop:s0 exact int +sys.usb.ffs.ready u:object_r:exported_ffs_prop:s0 exact bool sys.usb.mtp.device_type u:object_r:exported2_system_prop:s0 exact int +sys.usb.ffs.mtp.ready u:object_r:exported_ffs_prop:s0 exact bool sys.usb.state u:object_r:exported2_system_prop:s0 exact string telephony.lteOnCdmaDevice u:object_r:exported3_default_prop:s0 exact int tombstoned.max_tombstone_count u:object_r:exported3_default_prop:s0 exact int vold.post_fs_data_done u:object_r:exported2_vold_prop:s0 exact int +vts.native_server.on u:object_r:exported3_default_prop:s0 exact bool wlan.driver.status u:object_r:exported_wifi_prop:s0 exact enum ok unloaded -# vendor-init-readable|vendor-init-actionable +# vendor-init-readable dev.bootcomplete u:object_r:exported3_system_prop:s0 exact bool persist.sys.usb.usbradio.config u:object_r:exported3_system_prop:s0 exact string sys.boot_completed u:object_r:exported3_system_prop:s0 exact bool sys.retaildemo.enabled u:object_r:exported3_system_prop:s0 exact int +sys.user.0.ce_available u:object_r:exported3_system_prop:s0 exact bool +sys.vdso u:object_r:exported3_system_prop:s0 exact string -# vendor-init-settable|vendor-init-actionable +# vendor-init-settable persist.sys.zram_enabled u:object_r:exported2_system_prop:s0 exact bool sys.usb.config u:object_r:exported_system_radio_prop:s0 exact string sys.usb.configfs u:object_r:exported_system_radio_prop:s0 exact int @@ -165,7 +171,12 @@ ro.aac_drc_effect_type u:object_r:exported2_default_prop:s0 exact int drm.64bit.enabled u:object_r:exported2_default_prop:s0 exact bool dumpstate.dry_run u:object_r:exported_dumpstate_prop:s0 exact bool hal.instrumentation.enable u:object_r:exported2_default_prop:s0 exact bool +init.svc.console u:object_r:exported2_default_prop:s0 exact string +init.svc.dumpstatez u:object_r:exported2_default_prop:s0 exact string +init.svc.mediadrm u:object_r:exported2_default_prop:s0 exact string +init.svc.surfaceflinger u:object_r:exported2_default_prop:s0 exact string init.svc.tombstoned u:object_r:exported2_default_prop:s0 exact string +init.svc.zygote u:object_r:exported2_default_prop:s0 exact string libc.debug.malloc.options u:object_r:exported2_default_prop:s0 exact string libc.debug.malloc.program u:object_r:exported2_default_prop:s0 exact string libc.debug.hooks.enable u:object_r:exported2_default_prop:s0 exact string @@ -320,7 +331,7 @@ wifi.concurrent.interface u:object_r:exported_default_prop:s0 exact string wifi.direct.interface u:object_r:exported_default_prop:s0 exact string wifi.interface u:object_r:exported_default_prop:s0 exact string -# vendor-init-actionable|public-readable +# public-readable ro.boot.revision u:object_r:exported2_default_prop:s0 exact string ro.bootmode u:object_r:exported2_default_prop:s0 exact string ro.build.type u:object_r:exported2_default_prop:s0 exact string -- GitLab