commit 3a53b49075d53434212875c139d6c1ca074429d8
author Nick Kralevich <nnk@google.com> Tue Jun 17 18:53:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 17 18:53:56 2014 +0000
tree 5fba49561cd19c3a9eec6557ec9f890d5670825a
parent 97690a28ea4f2d845027b52d84553b521a3174e7
parent 545c6599fa2702a3a220f486367e9df42b20e0b6

am 545c6599: am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."

* commit '545c6599fa2702a3a220f486367e9df42b20e0b6':
  Extend ueventd to use the label-by-symlink support in libselinux.

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 3119e8e..02698ef 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -196,7 +196,8 @@
 
 static void make_device(const char *path,
                         const char *upath UNUSED,
-                        int block, int major, int minor)
+                        int block, int major, int minor,
+                        const char **links)
 {
     unsigned uid;
     unsigned gid;
@@ -207,7 +208,7 @@
     mode = get_device_perm(path, &uid, &gid) | (block ? S_IFBLK : S_IFCHR);
 
     if (sehandle) {
-        selabel_lookup(sehandle, &secontext, path, mode);
+        selabel_lookup_best_match(sehandle, &secontext, path, links, mode);
         setfscreatecon(secontext);
     }
 
@@ -523,7 +524,7 @@
     int i;
 
     if(!strcmp(action, "add")) {
-        make_device(devpath, path, block, major, minor);
+        make_device(devpath, path, block, major, minor, (const char **)links);
         if (links) {
             for (i = 0; links[i]; i++)
                 make_link(devpath, links[i]);