commit ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea
author Geremy Condra <gcondra@google.com> Wed Apr 10 17:51:53 2013 -0700
committer repo sync <gcondra@google.com> Mon Apr 15 14:59:42 2013 -0700
tree aab767df1c2d6a977e3f2e85218ef314ab3d4f83
parent ebbe9807906dad946659b6e9f849030eaa87731b

Add logic to fixup file contexts after a policy update.

Bug: 8116902

(cherry picked from commit 47677a506febfe386d186f8f854d967f165a342f)

Change-Id: I2a50f68a53aee2c94d03d3e5ced1ea36337fde33

init/init.c

diff --git a/init/init.c b/init/init.c
index 93b5997..5c03dea 100755
--- a/init/init.c
+++ b/init/init.c
@@ -745,7 +745,7 @@
 #endif
 
 static const struct selinux_opt seopts_prop[] = {
-        { SELABEL_OPT_PATH, "/data/security/property_contexts" },
+        { SELABEL_OPT_PATH, "/data/security/current/property_contexts" },
         { SELABEL_OPT_PATH, "/property_contexts" },
         { 0, NULL }
 };
@@ -793,6 +793,11 @@
         selabel_close(sehandle_prop);
 
     selinux_init_all_handles();
+
+    selinux_android_fixcon("/data");
+    selinux_android_fixcon("/system");
+    selinux_android_fixcon("/dev");
+
     return 0;
 }