exynos9610: restorecon_recursive fpdata/keystore directories

* These are getting mis-labeled and causing a neverallow.

Change-Id: If1546db8876d4a9fe0f05b0cbdbf9b8c5fa0bfa4

diff --git a/configs/init/init.exynos9610.rc b/configs/init/init.exynos9610.rc
index 82b2241f865a749b12821f8a0bdd176936e56f93..76bbb935e4367aca027d6d44bd3939fc29409504 100644 (file)
--- a/configs/init/init.exynos9610.rc
+++ b/configs/init/init.exynos9610.rc
@@ -274,6 +274,8 @@ on post-fs-data
     chown radio radio /mnt/vendor/efs/CP_AUDIO_SLSI.bin
 
 on boot
+    restorecon_recursive /data/system/users/0/fpdata/
+
     setprop wifi.interface wlan0
     write /proc/sys/vm/min_free_order_shift 4
 
@@ -462,6 +464,9 @@ chmod 664 /sys/devices/platform/11500000.mali/dvfs_max_lock
 #load ecd firmware
     write /proc/ecd/load_firmware 1
 
+    restorecon_recursive /data/vendor_de/0/fpdata/
+    restorecon_recursive /data/misc/keystore/
+
 service fuse_sdcard /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard /storage/sdcard
     class late_start
     disabled

diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 70db74b4c70ce910fee4dcb633dc58e8192a6659..37c2dbcfb49c75482ee7d6087f9ceddd9f42eb70 100644 (file)
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -17,6 +17,7 @@ allow vendor_init tmpfs:dir ra_dir_perms;
 allow vendor_init tmpfs:lnk_file create_file_perms;
 
 allow vendor_init system_data_root_file:dir { relabelto setattr };
+allow vendor_init fingerprint_vendor_data_file:dir r_dir_perms;
 
 allow vendor_init unlabeled:{ dir file } { read getattr relabelfrom };
 

diff --git a/sepolicy/vendor/vold.te b/sepolicy/vendor/vold.te
index 5333275ae4d0ff94b9a62ce114ee60490715cec9..68d7f7d31dbfdbf2c8cb98ce2b27ef7ebff6e1dc 100644 (file)
--- a/sepolicy/vendor/vold.te
+++ b/sepolicy/vendor/vold.te
@@ -3,3 +3,6 @@ allow vold {
     mnt_product_file
     mnt_vendor_file
 }:dir r_dir_perms;
+
+allow vold_prepare_subdirs fingerprint_vendor_data_file:dir { relabelfrom relabelto r_dir_perms };
+allow vold_prepare_subdirs fingerprint_vendor_data_file:dir r_dir_perms;