commit 0e883f8cf7e8da17bbdd6d894bd4a7c8a3047eb7
author William Roberts <william.c.roberts@intel.com> Thu Jun 09 19:12:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 09 19:12:41 2016 +0000
tree cc1a3e791b502fd3c12e1cb1aa47d059524c168a
parent 6349f8860bc705a8362a062e6fc89499d9c14386
parent ce9a0d633dcacc07dc1332244bdeb71ed12d3ddd

Merge \"ueventd: only relabel devices if there\'s a delta\"
am: 95428817d6

Change-Id: I610cc91cd0e3d9ce679b4c98e142bada0593d1a8

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 1410e3b..32fec52 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -257,11 +257,25 @@
     /* If the node already exists update its SELinux label to handle cases when
      * it was created with the wrong context during coldboot procedure. */
     if (mknod(path, mode, dev) && (errno == EEXIST)) {
-        if (lsetfilecon(path, secontext)) {
+
+        char* fcon = nullptr;
+        int rc = lgetfilecon(path, &fcon);
+        if (rc < 0) {
+            ERROR("Cannot get SELinux label on '%s' device (%s)\n",
+                    path, strerror(errno));
+            goto out;
+        }
+
+        bool different = strcmp(fcon, secontext) != 0;
+        freecon(fcon);
+
+        if (different && lsetfilecon(path, secontext)) {
             ERROR("Cannot set '%s' SELinux label on '%s' device (%s)\n",
                     secontext, path, strerror(errno));
         }
     }
+
+out:
     chown(path, uid, -1);
     setegid(AID_ROOT);