Merge "sepolicy(wifi): Allow wifi service access to wifi apex directories" am: 0f6852b342

Change-Id: Icad94a647c7872df7a8fc7431fccee46a0cdc305
This commit is contained in:
Automerger Merge Worker 2020-02-22 04:17:25 +00:00
commit 59fd2e98be
6 changed files with 11 additions and 0 deletions

View File

@ -18,6 +18,8 @@ allow apexd apex_module_data_file:dir { create_dir_perms relabelfrom };
allow apexd apex_module_data_file:file { create_file_perms relabelfrom };
allow apexd apex_rollback_data_file:dir create_dir_perms;
allow apexd apex_rollback_data_file:file create_file_perms;
allow apexd apex_wifi_data_file:dir { create_dir_perms relabelto };
allow apexd apex_wifi_data_file:file { create_file_perms relabelto };
# Allow apexd to read directories under /data/misc_de in order to snapshot and
# restore apex data for all users.

View File

@ -12,6 +12,7 @@
apex_module_data_file
apex_permission_data_file
apex_rollback_data_file
apex_wifi_data_file
app_integrity_service
app_search_service
auth_service

View File

@ -516,6 +516,7 @@
/data/misc/adb(/.*)? u:object_r:adb_keys_file:s0
/data/misc/apexdata(/.*)? u:object_r:apex_module_data_file:s0
/data/misc/apexdata/com.android.permission(/.*)? u:object_r:apex_permission_data_file:s0
/data/misc/apexdata/com\.android\.wifi(/.*)? u:object_r:apex_wifi_data_file:s0
/data/misc/apexrollback(/.*)? u:object_r:apex_rollback_data_file:s0
/data/misc/apns(/.*)? u:object_r:radio_data_file:s0
/data/misc/audio(/.*)? u:object_r:audio_data_file:s0
@ -608,6 +609,8 @@
/data/misc_ce/[0-9]+/apexdata(/.*)? u:object_r:apex_module_data_file:s0
/data/misc_de/[0-9]+/apexdata/com.android.permission(/.*)? u:object_r:apex_permission_data_file:s0
/data/misc_ce/[0-9]+/apexdata/com.android.permission(/.*)? u:object_r:apex_permission_data_file:s0
/data/misc_de/[0-9]+/apexdata/com\.android\.wifi(/.*)? u:object_r:apex_wifi_data_file:s0
/data/misc_ce/[0-9]+/apexdata/com\.android\.wifi(/.*)? u:object_r:apex_wifi_data_file:s0
# Apex rollback directories
/data/misc_de/[0-9]+/apexrollback(/.*)? u:object_r:apex_rollback_data_file:s0

View File

@ -1100,6 +1100,8 @@ allow system_server vendor_apex_file:file r_file_perms;
allow system_server apex_module_data_file:dir { getattr search };
allow system_server apex_permission_data_file:dir create_dir_perms;
allow system_server apex_permission_data_file:file create_file_perms;
allow system_server apex_wifi_data_file:dir create_dir_perms;
allow system_server apex_wifi_data_file:file create_file_perms;
# Allow PasswordSlotManager rw access to /metadata/password_slots, so GSIs and the host image can
# communicate which slots are available for use.

View File

@ -17,6 +17,7 @@ allow vold_prepare_subdirs {
apex_module_data_file
apex_permission_data_file
apex_rollback_data_file
apex_wifi_data_file
backup_data_file
face_vendor_data_file
fingerprint_vendor_data_file
@ -29,6 +30,7 @@ allow vold_prepare_subdirs {
apex_module_data_file
apex_permission_data_file
apex_rollback_data_file
apex_wifi_data_file
backup_data_file
face_vendor_data_file
fingerprint_vendor_data_file

View File

@ -352,6 +352,7 @@ type adb_keys_file, file_type, data_file_type, core_data_file_type;
type apex_module_data_file, file_type, data_file_type, core_data_file_type;
type apex_permission_data_file, file_type, data_file_type, core_data_file_type;
type apex_rollback_data_file, file_type, data_file_type, core_data_file_type;
type apex_wifi_data_file, file_type, data_file_type, core_data_file_type;
type audio_data_file, file_type, data_file_type, core_data_file_type;
type audioserver_data_file, file_type, data_file_type, core_data_file_type;
type bluetooth_data_file, file_type, data_file_type, core_data_file_type;