From b1590adc2f29174378e9dbce283131f05230c762 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep <jeffv@google.com> Date: Wed, 24 Jan 2018 08:49:16 -0800 Subject: [PATCH] wpa_supplicant: move control sockets to /data/vendor Treble compliance. Bug: 70228425 Bug: 70393317 Test: complete wifi test in b/70393317 Test: Test wifi on Taimen and Sailfish Test: verify sockets exist in /data/vendor/wifi/wpa/sockets Change-Id: I217c0eda0e5af50bb603cfcc35d60bf0d9cad72e --- vendor/file.te | 2 +- vendor/file_contexts | 1 + vendor/hal_wifi_supplicant_default.te | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vendor/file.te b/vendor/file.te index 50238acb0..0b1fd7480 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -1,2 +1,2 @@ -# Hostapd conf files type hostapd_data_file, file_type, data_file_type; +type wpa_data_file, file_type, data_file_type; diff --git a/vendor/file_contexts b/vendor/file_contexts index 77b6d6529..756c57f92 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -54,3 +54,4 @@ # Data files # /data/vendor/wifi/hostapd(/.*)? u:object_r:hostapd_data_file:s0 +/data/vendor/wifi/wpa(/.*)? u:object_r:wpa_data_file:s0 diff --git a/vendor/hal_wifi_supplicant_default.te b/vendor/hal_wifi_supplicant_default.te index 8d7069c96..e078a3f04 100644 --- a/vendor/hal_wifi_supplicant_default.te +++ b/vendor/hal_wifi_supplicant_default.te @@ -12,3 +12,7 @@ type_transition hal_wifi_supplicant_default wifi_data_file:dir wpa_socket "socke hwbinder_use(hal_wifi_supplicant_default) allow hal_wifi_supplicant_default system_wifi_keystore_hwservice:hwservice_manager find; binder_call(hal_wifi_supplicant_default, wifi_keystore_service_server) + +allow hal_wifi_supplicant_default wpa_data_file:dir create_dir_perms; +allow hal_wifi_supplicant_default wpa_data_file:file create_file_perms; +allow hal_wifi_supplicant_default wpa_data_file:sock_file create_file_perms; -- GitLab