Merge "sepolicy: Add new wifi keystore HAL" into oc-dev am: 29f273ce6a
am: a21b8b0e1f
Change-Id: I959ce59a098036326ebfc3244972519fd129f364
This commit is contained in:
commit
a32386bbf3
5 changed files with 10 additions and 13 deletions
|
@ -233,6 +233,9 @@ attribute hal_vr_server;
|
|||
attribute hal_wifi;
|
||||
attribute hal_wifi_client;
|
||||
attribute hal_wifi_server;
|
||||
attribute hal_wifi_keystore;
|
||||
attribute hal_wifi_keystore_client;
|
||||
attribute hal_wifi_keystore_server;
|
||||
attribute hal_wifi_supplicant;
|
||||
attribute hal_wifi_supplicant_client;
|
||||
attribute hal_wifi_supplicant_server;
|
||||
|
|
2
public/hal_wifi_keystore.te
Normal file
2
public/hal_wifi_keystore.te
Normal file
|
@ -0,0 +1,2 @@
|
|||
# HwBinder IPC from client to server.
|
||||
binder_call(hal_wifi_keystore_client, hal_wifi_keystore_server)
|
|
@ -23,17 +23,6 @@ allow hal_wifi_supplicant wifi_data_file:file create_file_perms;
|
|||
allow hal_wifi_supplicant wpa_socket:dir create_dir_perms;
|
||||
allow hal_wifi_supplicant wpa_socket:sock_file create_file_perms;
|
||||
|
||||
# TODO(b/34131400): Use hwbinder to access keystore.
|
||||
use_keystore(hal_wifi_supplicant)
|
||||
binder_use(hal_wifi_supplicant)
|
||||
|
||||
# WPA (wifi) has a restricted set of permissions from the default.
|
||||
allow hal_wifi_supplicant keystore:keystore_key {
|
||||
get
|
||||
sign
|
||||
verify
|
||||
};
|
||||
|
||||
# Allow wpa_cli to work. wpa_cli creates a socket in
|
||||
# /data/misc/wifi/sockets which hal_wifi_supplicant supplicant communicates with.
|
||||
userdebug_or_eng(`
|
||||
|
|
|
@ -10,6 +10,9 @@ binder_call(keystore, system_server)
|
|||
# talk to keymaster
|
||||
hal_client_domain(keystore, hal_keymaster)
|
||||
|
||||
# Implement the wifi keystore hal.
|
||||
hal_server_domain(keystore, hal_wifi_keystore)
|
||||
|
||||
allow keystore keystore_data_file:dir create_dir_perms;
|
||||
allow keystore keystore_data_file:notdevfile_class_set create_file_perms;
|
||||
allow keystore keystore_exec:file { getattr };
|
||||
|
|
4
vendor/hal_wifi_supplicant_default.te
vendored
4
vendor/hal_wifi_supplicant_default.te
vendored
|
@ -8,8 +8,8 @@ net_domain(hal_wifi_supplicant_default)
|
|||
# Create a socket for receiving info from wpa
|
||||
type_transition hal_wifi_supplicant_default wifi_data_file:dir wpa_socket "sockets";
|
||||
|
||||
# TODO(b/34603782): Remove this once Wi-Fi Supplicant HAL stops using Binder
|
||||
typeattribute hal_wifi_supplicant_default binder_in_vendor_violators;
|
||||
# Allow wpa_supplicant to talk to Wifi Keystore HAL.
|
||||
hal_client_domain(hal_wifi_supplicant_default, hal_wifi_keystore)
|
||||
# TODO (b/36645291) Move hal_wifi_supplicant's data access to /data/vendor
|
||||
# Remove coredata_in_vendor_violators attribute.
|
||||
# wpa supplicant or equivalent
|
||||
|
|
Loading…
Reference in a new issue