Add wifi_hal_prop and remove exported_wifi_prop

To remove bad context names "exported*_prop"

Bug: 155844385
Test: boot and see no denials
Change-Id: Icd30be64355699618735d4012461835eca8cd651
Merged-In: Icd30be64355699618735d4012461835eca8cd651
(cherry picked from commit 37c2d4d0c9)
(cherry picked from commit 3b66e9b9f8)
This commit is contained in:
Inseob Kim 2020-06-25 21:20:42 +09:00
parent d2c0b7bf9e
commit 3dbf3d8ac8
10 changed files with 18 additions and 18 deletions

View file

@ -229,6 +229,7 @@
wait_for_keymaster_exec
wait_for_keymaster_tmpfs
watchdogd_tmpfs
wifi_hal_prop
wm_trace_data_file
wpantund
wpantund_exec

View file

@ -6,6 +6,7 @@
(type exported_system_radio_prop)
(type exported_radio_prop)
(type exported_vold_prop)
(type exported_wifi_prop)
(type exported2_config_prop)
(type exported2_radio_prop)
(type exported2_vold_prop)
@ -1406,7 +1407,7 @@
usb_config_prop
usb_control_prop))
(typeattributeset exported_vold_prop_30_0 (exported_vold_prop vold_status_prop))
(typeattributeset exported_wifi_prop_30_0 (exported_wifi_prop))
(typeattributeset exported_wifi_prop_30_0 (exported_wifi_prop wifi_hal_prop))
(typeattributeset external_vibrator_service_30_0 (external_vibrator_service))
(typeattributeset face_service_30_0 (face_service))
(typeattributeset face_vendor_data_file_30_0 (face_vendor_data_file))

View file

@ -53,8 +53,7 @@ dontaudit gmscore_app sysfs:file r_file_perms;
dontaudit gmscore_app sysfs_android_usb:file r_file_perms;
dontaudit gmscore_app sysfs_dm:file r_file_perms;
dontaudit gmscore_app sysfs_loop:file r_file_perms;
dontaudit gmscore_app wifi_prop:file r_file_perms;
dontaudit gmscore_app { wifi_prop exported_wifi_prop }:file r_file_perms;
dontaudit gmscore_app { wifi_prop wifi_hal_prop }:file r_file_perms;
dontaudit gmscore_app mirror_data_file:dir search;
# Access the network

View file

@ -134,8 +134,7 @@ dontaudit priv_app sysfs:dir read;
dontaudit priv_app sysfs:file read;
dontaudit priv_app sysfs_android_usb:file read;
dontaudit priv_app sysfs_dm:file r_file_perms;
dontaudit priv_app wifi_prop:file read;
dontaudit priv_app { wifi_prop exported_wifi_prop }:file read;
dontaudit priv_app { wifi_prop wifi_hal_prop }:file read;
# allow privileged apps to use UDP sockets provided by the system server but not
# modify them other than to connect

View file

@ -218,12 +218,13 @@ compatible_property_only(`
neverallow {
domain
-coredomain
-init
-dumpstate
-hal_wifi_server
-wificond
-vendor_init
} {
exported_wifi_prop
wifi_hal_prop
}:property_service set;
# Prevent properties from being read

View file

@ -490,8 +490,6 @@ tombstoned.max_tombstone_count u:object_r:tombstone_config_prop:s0 exact int
vold.post_fs_data_done u:object_r:vold_config_prop:s0 exact int
wlan.driver.status u:object_r:exported_wifi_prop:s0 exact enum ok unloaded
apexd.status u:object_r:apexd_prop:s0 exact enum starting activated ready
dev.bootcomplete u:object_r:boot_status_prop:s0 exact bool
@ -751,11 +749,12 @@ ro.vts.coverage u:object_r:vts_config_prop:s0 exact int
vts.native_server.on u:object_r:vts_status_prop:s0 exact bool
wifi.active.interface u:object_r:exported_wifi_prop:s0 exact string
wifi.aware.interface u:object_r:exported_wifi_prop:s0 exact string
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
wifi.active.interface u:object_r:wifi_hal_prop:s0 exact string
wifi.aware.interface u:object_r:wifi_hal_prop:s0 exact string
wifi.concurrent.interface u:object_r:wifi_hal_prop:s0 exact string
wifi.direct.interface u:object_r:wifi_hal_prop:s0 exact string
wifi.interface u:object_r:wifi_hal_prop:s0 exact string
wlan.driver.status u:object_r:wifi_hal_prop:s0 exact enum ok unloaded
ro.apex.updatable u:object_r:exported_default_prop:s0 exact bool

View file

@ -1,6 +1,6 @@
typeattribute wificond coredomain;
set_prop(wificond, exported_wifi_prop)
set_prop(wificond, wifi_hal_prop)
set_prop(wificond, wifi_prop)
set_prop(wificond, ctl_default_prop)

View file

@ -7,7 +7,7 @@ hal_attribute_hwservice(hal_wifi, hal_wifi_hwservice)
r_dir_file(hal_wifi, proc_net_type)
r_dir_file(hal_wifi, sysfs_type)
set_prop(hal_wifi, exported_wifi_prop)
set_prop(hal_wifi, wifi_hal_prop)
set_prop(hal_wifi, wifi_prop)
# allow hal wifi set interfaces up and down and get the factory MAC

View file

@ -163,7 +163,6 @@ system_public_prop(exported3_radio_prop)
system_public_prop(exported_bluetooth_prop)
system_public_prop(exported_overlay_prop)
system_public_prop(exported_pm_prop)
system_public_prop(exported_wifi_prop)
system_public_prop(ffs_control_prop)
system_public_prop(sota_prop)
system_public_prop(hwservicemanager_prop)
@ -182,6 +181,7 @@ system_public_prop(surfaceflinger_color_prop)
system_public_prop(system_prop)
system_public_prop(telephony_status_prop)
system_public_prop(usb_control_prop)
system_public_prop(wifi_hal_prop)
system_public_prop(wifi_log_prop)
system_public_prop(wifi_prop)
system_public_prop(zram_control_prop)

View file

@ -219,7 +219,6 @@ set_prop(vendor_init, exported_config_prop)
set_prop(vendor_init, exported_default_prop)
set_prop(vendor_init, exported_overlay_prop)
set_prop(vendor_init, exported_pm_prop)
set_prop(vendor_init, exported_wifi_prop)
set_prop(vendor_init, exported2_system_prop)
set_prop(vendor_init, exported3_default_prop)
set_prop(vendor_init, exported3_radio_prop)
@ -239,6 +238,7 @@ set_prop(vendor_init, vendor_default_prop)
set_prop(vendor_init, vendor_security_patch_level_prop)
set_prop(vendor_init, vndk_prop)
set_prop(vendor_init, virtual_ab_prop)
set_prop(vendor_init, wifi_hal_prop)
set_prop(vendor_init, wifi_log_prop)
set_prop(vendor_init, zram_control_prop)