commit b66ee6c32d87961d5b9f0be97b5fdccb928fd453
author Nick Kralevich <nnk@google.com> Tue May 13 20:32:19 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 13 20:32:19 2014 +0000
tree 46ba90a49b5ebd0cd544a86c141ab0481bd925a1
parent bd20e551f64234142e1146f9fa4b2dcebbd72122
parent 3a98389263ea0bf9656bcc6869855099194f498c

Merge "Ensure that app lib symlinks are correctly labeled when created."

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index cfb80e3..70510a5 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -85,13 +85,6 @@
         }
     }
 
-    if (symlink(applibdir, libsymlink) < 0) {
-        ALOGE("couldn't symlink directory '%s' -> '%s': %s\n", libsymlink, applibdir,
-                strerror(errno));
-        unlink(pkgdir);
-        return -1;
-    }
-
     if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {
         ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
         unlink(libsymlink);
@@ -99,6 +92,13 @@
         return -errno;
     }
 
+    if (symlink(applibdir, libsymlink) < 0) {
+        ALOGE("couldn't symlink directory '%s' -> '%s': %s\n", libsymlink, applibdir,
+                strerror(errno));
+        unlink(pkgdir);
+        return -1;
+    }
+
     if (chown(pkgdir, uid, gid) < 0) {
         ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
         unlink(libsymlink);
@@ -241,13 +241,6 @@
         }
     }
 
-    if (symlink(applibdir, libsymlink) < 0) {
-        ALOGE("couldn't symlink directory for non-primary '%s' -> '%s': %s\n", libsymlink,
-                applibdir, strerror(errno));
-        unlink(pkgdir);
-        return -1;
-    }
-
     if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {
         ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
         unlink(libsymlink);
@@ -255,6 +248,13 @@
         return -errno;
     }
 
+    if (symlink(applibdir, libsymlink) < 0) {
+        ALOGE("couldn't symlink directory for non-primary '%s' -> '%s': %s\n", libsymlink,
+                applibdir, strerror(errno));
+        unlink(pkgdir);
+        return -1;
+    }
+
     if (chown(pkgdir, uid, uid) < 0) {
         ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
         unlink(libsymlink);