Label /sys/class/net/wlan0/* as sysfs_net.
Removed sysfs_wifi type and replaced its every occurence with sysfs_net.
Fixes this denial:
avc: denied { read } for comm="Binder:5993_3" name="address" dev="sysfs"
ino=51277 scontext=u:r:priv_app:s0:c512,c768
tcontext=u:object_r:sysfs_wifi:s0 tclass=file permissive=0
Fixes: 73345332
Test: /sys/class/net/wlan0 relabeled as expected.
Change-Id: I3e697a0c3ea88d64d6d20c7ad346534aa5409210
diff --git a/sepolicy/cnss-daemon.te b/sepolicy/cnss-daemon.te
index 99faf07..9b35ebe 100644
--- a/sepolicy/cnss-daemon.te
+++ b/sepolicy/cnss-daemon.te
@@ -17,8 +17,8 @@
allow cnss-daemon proc_net:file rw_file_perms;
allow cnss-daemon sysfs:dir r_dir_perms;
-allow cnss-daemon sysfs_wifi:dir search;
-allow cnss-daemon sysfs_wifi:file rw_file_perms;
+allow cnss-daemon sysfs_net:dir search;
+allow cnss-daemon sysfs_net:file rw_file_perms;
allow cnss-daemon sysfs_pcie:dir search;
allow cnss-daemon sysfs_pcie:file w_file_perms;
allow cnss-daemon sysfs_soc:dir search;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index ff51f92..cfc92c7 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -34,7 +34,6 @@
type sysfs_soc, sysfs_type, fs_type, mlstrustedobject;
type sysfs_timestamp_switch, sysfs_type, fs_type;
type sysfs_video, sysfs_type, fs_type;
-type sysfs_wifi, sysfs_type, fs_type, mlstrustedobject;
type sysfs_diag, fs_type, sysfs_type;
type sysfs_scsi_devices_0000, sysfs_type, fs_type;
# b/70518189 vDSO experiments
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
index 7456d25..c741a90 100644
--- a/sepolicy/genfs_contexts
+++ b/sepolicy/genfs_contexts
@@ -48,7 +48,7 @@
genfscon sysfs /devices/soc0 u:object_r:sysfs_soc:s0
genfscon sysfs /devices/virtual/htc_laser u:object_r:sysfs_camera:s0
genfscon sysfs /devices/virtual/htc_laser/laser/enable_ps_sensor u:object_r:sysfs_enable_ps_sensor:s0
-genfscon sysfs /devices/soc/600000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/wlan0 u:object_r:sysfs_wifi:s0
+genfscon sysfs /devices/soc/600000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/wlan0 u:object_r:sysfs_net:s0
genfscon sysfs /devices/soc/0.qcom,rmtfs_sharedmem u:object_r:sysfs_rmtfs:s0
genfscon sysfs /devices/soc/84000000.qcom,rmtfs_rtel_sharedmem u:object_r:sysfs_rmtfs:s0
genfscon sysfs /module/lpm_levels/parameters u:object_r:sysfs_power_management:s0
diff --git a/sepolicy/hal_wifi_hostapd.te b/sepolicy/hal_wifi_hostapd.te
index cb52e29..5232050 100644
--- a/sepolicy/hal_wifi_hostapd.te
+++ b/sepolicy/hal_wifi_hostapd.te
@@ -1,3 +1,3 @@
allow hal_wifi_hostapd_server sysfs_pcie:dir search;
-allow hal_wifi_hostapd_server sysfs_wifi:dir search;
-allow hal_wifi_hostapd_server sysfs_wifi:file r_file_perms;
+allow hal_wifi_hostapd_server sysfs_net:dir search;
+allow hal_wifi_hostapd_server sysfs_net:file r_file_perms;
