Chmod for existing nodes which mode not the same as ueventd.rc
Change-Id: I5b0a918d4085b55daff5be1f4fc4496fabfb4cce
diff --git a/init/devices.cpp b/init/devices.cpp
index d4a3cb9..28406f6 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -307,8 +307,8 @@
PLOG(ERROR) << "setegid(" << gid << ") for " << path << " device failed";
goto out;
}
- /* If the node already exists update its SELinux label to handle cases when
- * it was created with the wrong context during coldboot procedure. */
+ /* If the node already exists update its SELinux label and the file mode to handle cases when
+ * it was created with the wrong context and file mode during coldboot procedure. */
if (mknod(path.c_str(), mode, dev) && (errno == EEXIST) && !secontext.empty()) {
char* fcon = nullptr;
int rc = lgetfilecon(path.c_str(), &fcon);
@@ -330,6 +330,11 @@
if (gid != s.st_gid) {
new_group = gid;
}
+ if (mode != s.st_mode) {
+ if (chmod(path.c_str(), mode) != 0) {
+ PLOG(ERROR) << "Cannot chmod " << path << " to " << mode;
+ }
+ }
} else {
PLOG(ERROR) << "Cannot stat " << path;
}