Whitelist vendor-init-settable bluetooth_prop and wifi_prop
Values of the following properties are set by SoC vendors on some
devices including Pixels.
- persist.bluetooth.a2dp_offload.cap
- persist.bluetooth.a2dp_offload.enable
- persist.vendor.bluetooth.a2dp_offload.enable
- ro.bt.bdaddr_path
- wlan.driver.status
So they should be whitelisted for compatibility.
Bug: 77633703
Test: succeeded building and tested with Pixels
Change-Id: Ib2b81bcc1fd70ddd571dc7fb2b923b576d62b7d5
Merged-In: Ib2b81bcc1fd70ddd571dc7fb2b923b576d62b7d5
(cherry picked from commit 224921d18a
)
This commit is contained in:
parent
cb336d8965
commit
a11b16c9ee
16 changed files with 41 additions and 3 deletions
|
@ -37,7 +37,9 @@ allow audioserver power_service:service_manager find;
|
|||
allow audioserver scheduling_policy_service:service_manager find;
|
||||
|
||||
# Allow read/write access to bluetooth-specific properties
|
||||
set_prop(audioserver, bluetooth_a2dp_offload_prop)
|
||||
set_prop(audioserver, bluetooth_prop)
|
||||
set_prop(audioserver, exported_bluetooth_prop)
|
||||
|
||||
# Grant access to audio files to audioserver
|
||||
allow audioserver audio_data_file:dir ra_dir_perms;
|
||||
|
|
|
@ -39,7 +39,9 @@ allow bluetooth uhid_device:chr_file rw_file_perms;
|
|||
allow bluetooth proc_bluetooth_writable:file rw_file_perms;
|
||||
|
||||
# Allow write access to bluetooth specific properties
|
||||
set_prop(bluetooth, bluetooth_a2dp_offload_prop)
|
||||
set_prop(bluetooth, bluetooth_prop)
|
||||
set_prop(bluetooth, exported_bluetooth_prop)
|
||||
set_prop(bluetooth, pan_result_prop)
|
||||
|
||||
allow bluetooth audioserver_service:service_manager find;
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
blank_screen
|
||||
blank_screen_exec
|
||||
blank_screen_tmpfs
|
||||
bluetooth_a2dp_offload_prop
|
||||
bpfloader
|
||||
bpfloader_exec
|
||||
broadcastradio_service
|
||||
|
@ -17,6 +18,7 @@
|
|||
crossprofileapps_service
|
||||
e2fs
|
||||
e2fs_exec
|
||||
exported_bluetooth_prop
|
||||
exported_config_prop
|
||||
exported_dalvik_prop
|
||||
exported_default_prop
|
||||
|
@ -30,6 +32,7 @@
|
|||
exported_system_prop
|
||||
exported_system_radio_prop
|
||||
exported_vold_prop
|
||||
exported_wifi_prop
|
||||
exported2_config_prop
|
||||
exported2_default_prop
|
||||
exported2_radio_prop
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
blank_screen_exec
|
||||
blank_screen_tmpfs
|
||||
bootloader_boot_reason_prop
|
||||
bluetooth_a2dp_offload_prop
|
||||
bpfloader
|
||||
bpfloader_exec
|
||||
cgroup_bpf
|
||||
|
@ -21,6 +22,7 @@
|
|||
exported3_default_prop
|
||||
exported3_radio_prop
|
||||
exported3_system_prop
|
||||
exported_bluetooth_prop
|
||||
exported_config_prop
|
||||
exported_dalvik_prop
|
||||
exported_default_prop
|
||||
|
@ -34,6 +36,7 @@
|
|||
exported_system_prop
|
||||
exported_system_radio_prop
|
||||
exported_vold_prop
|
||||
exported_wifi_prop
|
||||
fingerprint_vendor_data_file
|
||||
fs_bpf
|
||||
hal_authsecret_hwservice
|
||||
|
|
|
@ -149,6 +149,7 @@ dontaudit priv_app proc_version:file read;
|
|||
dontaudit priv_app sysfs:dir read;
|
||||
dontaudit priv_app sysfs_android_usb:file read;
|
||||
dontaudit priv_app wifi_prop:file read;
|
||||
dontaudit priv_app { wifi_prop exported_wifi_prop }:file read;
|
||||
|
||||
# allow privileged apps to use UDP sockets provided by the system server but not
|
||||
# modify them other than to connect
|
||||
|
|
|
@ -31,9 +31,11 @@ allow system_app wallpaper_file:file r_file_perms;
|
|||
allow system_app icon_file:file r_file_perms;
|
||||
|
||||
# Write to properties
|
||||
set_prop(system_app, bluetooth_a2dp_offload_prop)
|
||||
set_prop(system_app, bluetooth_prop)
|
||||
set_prop(system_app, debug_prop)
|
||||
set_prop(system_app, system_prop)
|
||||
set_prop(system_app, exported_bluetooth_prop)
|
||||
set_prop(system_app, exported_system_prop)
|
||||
set_prop(system_app, exported2_system_prop)
|
||||
set_prop(system_app, exported3_system_prop)
|
||||
|
|
|
@ -133,4 +133,8 @@ neverallow webview_zygote domain:{
|
|||
|
||||
# Do not allow access to Bluetooth-related system properties.
|
||||
# neverallow rules for Bluetooth-related data files are listed above.
|
||||
neverallow webview_zygote bluetooth_prop:file create_file_perms;
|
||||
neverallow webview_zygote {
|
||||
bluetooth_a2dp_offload_prop
|
||||
bluetooth_prop
|
||||
exported_bluetooth_prop
|
||||
}:file create_file_perms;
|
||||
|
|
|
@ -133,4 +133,8 @@ neverallow zygote {
|
|||
}:file no_x_file_perms;
|
||||
|
||||
# Do not allow access to Bluetooth-related system properties and files
|
||||
neverallow zygote bluetooth_prop:file create_file_perms;
|
||||
neverallow zygote {
|
||||
bluetooth_a2dp_offload_prop
|
||||
bluetooth_prop
|
||||
exported_bluetooth_prop
|
||||
}:file create_file_perms;
|
||||
|
|
|
@ -567,7 +567,7 @@ neverallow {
|
|||
appdomain
|
||||
-bluetooth
|
||||
-system_app
|
||||
} bluetooth_prop:file create_file_perms;
|
||||
} { bluetooth_a2dp_offload_prop bluetooth_prop exported_bluetooth_prop }:file create_file_perms;
|
||||
|
||||
# Apps cannot access proc_uid_time_in_state
|
||||
neverallow appdomain proc_uid_time_in_state:file *;
|
||||
|
|
|
@ -34,3 +34,5 @@ neverallow hal_audio_server domain:{ tcp_socket udp_socket rawip_socket } *;
|
|||
|
||||
# Only audio HAL may directly access the audio hardware
|
||||
neverallow { halserverdomain -hal_audio_server } audio_device:chr_file *;
|
||||
|
||||
get_prop(hal_audio, bluetooth_a2dp_offload_prop)
|
||||
|
|
|
@ -21,7 +21,9 @@ allow hal_bluetooth sysfs_bluetooth_writable:file rw_file_perms;
|
|||
allow hal_bluetooth self:global_capability2_class_set wake_alarm;
|
||||
|
||||
# Allow write access to bluetooth-specific properties
|
||||
set_prop(hal_bluetooth, bluetooth_a2dp_offload_prop)
|
||||
set_prop(hal_bluetooth, bluetooth_prop)
|
||||
set_prop(hal_bluetooth, exported_bluetooth_prop)
|
||||
|
||||
# /proc access (bluesleep etc.).
|
||||
allow hal_bluetooth proc_bluetooth_writable:file rw_file_perms;
|
||||
|
|
|
@ -8,6 +8,7 @@ allow hal_wifi_client hal_wifi_hwservice:hwservice_manager find;
|
|||
r_dir_file(hal_wifi, proc_net)
|
||||
r_dir_file(hal_wifi, sysfs_type)
|
||||
|
||||
set_prop(hal_wifi, exported_wifi_prop)
|
||||
set_prop(hal_wifi, wifi_prop)
|
||||
|
||||
# allow hal wifi set interfaces up and down
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
type audio_prop, property_type, core_property_type;
|
||||
type boottime_prop, property_type;
|
||||
type bluetooth_a2dp_offload_prop, property_type;
|
||||
type bluetooth_prop, property_type;
|
||||
type bootloader_boot_reason_prop, property_type;
|
||||
type config_prop, property_type, core_property_type;
|
||||
|
@ -55,6 +56,7 @@ type wifi_log_prop, property_type, log_property_type;
|
|||
type wifi_prop, property_type;
|
||||
|
||||
# Properties for whitelisting
|
||||
type exported_bluetooth_prop, property_type;
|
||||
type exported_config_prop, property_type;
|
||||
type exported_dalvik_prop, property_type;
|
||||
type exported_default_prop, property_type;
|
||||
|
@ -67,6 +69,7 @@ type exported_radio_prop, property_type;
|
|||
type exported_system_prop, property_type;
|
||||
type exported_system_radio_prop, property_type;
|
||||
type exported_vold_prop, property_type;
|
||||
type exported_wifi_prop, property_type;
|
||||
type exported2_config_prop, property_type;
|
||||
type exported2_default_prop, property_type;
|
||||
type exported2_radio_prop, property_type;
|
||||
|
|
|
@ -62,6 +62,8 @@ dalvik.vm.zygote.max-boot-retry u:object_r:exported_dalvik_prop:s0 exact int
|
|||
drm.service.enabled u:object_r:exported3_default_prop:s0 exact bool
|
||||
keyguard.no_require_sim u:object_r:exported3_default_prop:s0 exact bool
|
||||
media.recorder.show_manufacturer_and_model 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.enable u:object_r:bluetooth_a2dp_offload_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
|
||||
|
@ -70,6 +72,7 @@ persist.radio.multisim.config u:object_r:exported3_radio_prop:s0 exact string
|
|||
persist.sys.dalvik.vm.lib.2 u:object_r:exported2_system_prop:s0 exact string
|
||||
persist.sys.sf.color_saturation u:object_r:exported2_system_prop:s0 exact string
|
||||
persist.sys.sf.native_mode u:object_r:exported2_system_prop:s0 exact bool
|
||||
persist.vendor.bluetooth.a2dp_offload.enable u:object_r:bluetooth_a2dp_offload_prop:s0 exact bool
|
||||
pm.dexopt.ab-ota u:object_r:exported_pm_prop:s0 exact string
|
||||
pm.dexopt.bg-dexopt u:object_r:exported_pm_prop:s0 exact string
|
||||
pm.dexopt.boot u:object_r:exported_pm_prop:s0 exact string
|
||||
|
@ -78,6 +81,7 @@ pm.dexopt.install u:object_r:exported_pm_prop:s0 exact string
|
|||
ro.audio.monitorRotation u:object_r:exported3_default_prop:s0 exact bool
|
||||
ro.boot.vendor.overlay.theme u:object_r:exported_overlay_prop:s0 exact string
|
||||
ro.boot.wificountrycode u:object_r:exported3_default_prop:s0 exact string
|
||||
ro.bt.bdaddr_path u:object_r:exported_bluetooth_prop:s0 exact string
|
||||
ro.camera.notify_nfc u:object_r:exported3_default_prop:s0 exact int
|
||||
ro.com.android.dataroaming u:object_r:exported3_default_prop:s0 exact bool
|
||||
ro.com.android.prov_mobiledata u:object_r:exported3_default_prop:s0 exact bool
|
||||
|
@ -113,6 +117,7 @@ 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
|
||||
wlan.driver.status u:object_r:exported_wifi_prop:s0 exact enum ok unloaded
|
||||
|
||||
# vendor-init-readable|vendor-init-actionable
|
||||
dev.bootcomplete u:object_r:exported3_system_prop:s0 exact bool
|
||||
|
|
|
@ -159,7 +159,9 @@ not_compatible_property(`
|
|||
})
|
||||
')
|
||||
|
||||
set_prop(vendor_init, bluetooth_a2dp_offload_prop)
|
||||
set_prop(vendor_init, debug_prop)
|
||||
set_prop(vendor_init, exported_bluetooth_prop)
|
||||
set_prop(vendor_init, exported_config_prop)
|
||||
set_prop(vendor_init, exported_dalvik_prop)
|
||||
set_prop(vendor_init, exported_default_prop)
|
||||
|
@ -168,6 +170,7 @@ set_prop(vendor_init, exported_overlay_prop)
|
|||
set_prop(vendor_init, exported_pm_prop)
|
||||
set_prop(vendor_init, exported_radio_prop)
|
||||
set_prop(vendor_init, exported_system_radio_prop)
|
||||
set_prop(vendor_init, exported_wifi_prop)
|
||||
set_prop(vendor_init, exported2_config_prop)
|
||||
set_prop(vendor_init, exported2_system_prop)
|
||||
set_prop(vendor_init, exported2_vold_prop)
|
||||
|
|
|
@ -7,6 +7,7 @@ binder_call(wificond, system_server)
|
|||
|
||||
add_service(wificond, wificond_service)
|
||||
|
||||
set_prop(wificond, exported_wifi_prop)
|
||||
set_prop(wificond, wifi_prop)
|
||||
set_prop(wificond, ctl_default_prop)
|
||||
|
||||
|
|
Loading…
Reference in a new issue