summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-07-11 15:38:26 -0700
committerNick Kralevich <nnk@google.com>2013-09-03 15:55:58 -0700
commitae76f6dbcf3dfd6eda223911f91f4a1316433771 (patch)
tree43e8ace85a57967e30c850763ece575f2bf684ee /init
parent935bd3e31574ea83db84797b0dee2a6581a19cdf (diff)
downloadsystem_core-ae76f6dbcf3dfd6eda223911f91f4a1316433771.zip
system_core-ae76f6dbcf3dfd6eda223911f91f4a1316433771.tar.gz
system_core-ae76f6dbcf3dfd6eda223911f91f4a1316433771.tar.bz2
init: call restorecon on /sys
Not all files on /sys are not getting labeled properly. Fix them. Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
Diffstat (limited to 'init')
-rw-r--r--init/init.c1
-rw-r--r--[-rwxr-xr-x]init/util.c15
-rw-r--r--init/util.h1
3 files changed, 17 insertions, 0 deletions
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 @@ int main(int argc, char **argv)
restorecon("/dev");
restorecon("/dev/socket");
restorecon("/dev/__properties__");
+ restorecon_recursive("/sys");
is_charger = !strcmp(bootmode, "charger");
diff --git a/init/util.c b/init/util.c
index 1820aa9..154bb2d 100755..100644
--- 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 @@ int restorecon(const char *pathname)
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);
+}
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 get_hardware_name(char *hardware, unsigned int *revision);
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