commit f487e07bce49735235b91bf5ee79b6987ff80188
author Nick Kralevich <nnk@google.com> Tue Sep 03 16:43:01 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 16:43:01 2013 -0700
tree 36c44fb5395ca484ec0f647bfb92a30ec6f24d0a
parent 49382f12f2e8278a02019d78482df00bb7f7fad7
parent 531328400ed6ce513f9bb4d9d772f02affeeaa26

am 53132840: Merge "init: call restorecon on /sys"

* commit '531328400ed6ce513f9bb4d9d772f02affeeaa26':
  init: call restorecon on /sys

init/init.c

diff --git a/init/init.c b/init/init.c
index 294c2c4..b699be0 100644
--- a/init/init.c
+++ b/init/init.c
@@ -945,6 +945,7 @@
     restorecon("/dev");
     restorecon("/dev/socket");
     restorecon("/dev/__properties__");
+    restorecon_recursive("/sys");
 
     is_charger = !strcmp(bootmode, "charger");
 

init/util.c

diff --git a/init/util.c b/init/util.c
old mode 100755
new mode 100644
index 1820aa9..154bb2d
--- a/init/util.c
+++ b/init/util.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <time.h>
+#include <ftw.h>
 
 #include <selinux/label.h>
 
@@ -519,3 +520,17 @@
     freecon(secontext);
     return 0;
 }
+
+static int nftw_restorecon(const char* filename, const struct stat* statptr,
+    int fileflags, struct FTW* pftw)
+{
+    restorecon(filename);
+    return 0;
+}
+
+int restorecon_recursive(const char* pathname)
+{
+    int fd_limit = 20;
+    int flags = FTW_DEPTH | FTW_MOUNT | FTW_PHYS;
+    return nftw(pathname, nftw_restorecon, fd_limit, flags);
+}

init/util.h

diff --git a/init/util.h b/init/util.h
index 39d6f52..04b8129 100644
--- a/init/util.h
+++ b/init/util.h
@@ -41,4 +41,5 @@
 void import_kernel_cmdline(int in_qemu, void (*import_kernel_nv)(char *name, int in_qemu));
 int make_dir(const char *path, mode_t mode);
 int restorecon(const char *pathname);
+int restorecon_recursive(const char *pathname);
 #endif