Merge "Fix zipfuse race condition"

This commit is contained in:
Treehugger Robot 2022-10-10 15:51:12 +00:00 committed by Gerrit Code Review
commit 24b66bcf11
4 changed files with 8 additions and 0 deletions

View file

@ -76,6 +76,9 @@ set_prop(microdroid_manager, ctl_tombstoned_prop)
# Allow microdroid_manager to wait for linkerconfig to be ready
get_prop(microdroid_manager, apex_config_prop)
# Allow microdroid_manager to wait for zipfuse to be ready
get_prop(microdroid_manager, microdroid_manager_zipfuse_prop)
# Allow microdroid_manager to pass the roothash to apkdmverity
set_prop(microdroid_manager, microdroid_manager_roothash_prop)

View file

@ -121,6 +121,7 @@ ro.property_service.version u:object_r:property_service_version_prop:s0 exact in
apex_config.done u:object_r:apex_config_prop:s0 exact bool
microdroid_manager.apk_root_hash u:object_r:microdroid_manager_roothash_prop:s0 exact string
microdroid_manager.apk.mounted u:object_r:microdroid_manager_zipfuse_prop:s0 exact bool
dev.mnt.blk.root u:object_r:dev_mnt_prop:s0 exact string
dev.mnt.blk.vendor u:object_r:dev_mnt_prop:s0 exact string

View file

@ -43,6 +43,9 @@ allow zipfuse extra_apk_file:dir mounton;
# zipfuse is forked from microdroid_manager
allow zipfuse microdroid_manager:fd use;
# allow signalling when the mount is ready
set_prop(zipfuse, microdroid_manager_zipfuse_prop)
# Only microdroid_manager can run zipfuse
neverallow { domain -microdroid_manager } zipfuse:process { transition dyntransition };

View file

@ -40,6 +40,7 @@ type libc_debug_prop, property_type;
type log_prop, property_type;
type log_tag_prop, property_type;
type microdroid_manager_roothash_prop, property_type;
type microdroid_manager_zipfuse_prop, property_type;
type property_service_version_prop, property_type;
type shell_prop, property_type;
type timezone_prop, property_type;