diff options
| author | Kenny Root <kroot@google.com> | 2012-10-17 09:57:15 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-17 09:57:15 -0700 |
| commit | 40f2f751ac7cebc455b44da23b9589cca5ae2e25 (patch) | |
| tree | 72d5760e474993dea9867ac08a10b07151e0c10c | |
| parent | 85f9ba9e7fdf9c3bf063f2e4c44a670861b4f199 (diff) | |
| parent | 57c63d8f9b1a2839f47a68feb1da51ab558e5d8a (diff) | |
| download | base-tools_r21.tar.gz | |
Merge "Fix mistaken removal of setfilecon"tools_r21
| -rw-r--r-- | cmds/installd/commands.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 9d0dc5316c6d..0d0a6f0740ef 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -73,13 +73,20 @@ int install(const char *pkgname, uid_t uid, gid_t gid) return -errno; } - if (selinux_android_setfilecon(libdir, pkgname, uid) < 0) { + if (selinux_android_setfilecon(libdir, pkgname, AID_SYSTEM) < 0) { ALOGE("cannot setfilecon dir '%s': %s\n", libdir, strerror(errno)); unlink(libdir); unlink(pkgdir); return -errno; } + if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) { + ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); + unlink(libdir); + unlink(pkgdir); + return -errno; + } + if (chown(pkgdir, uid, gid) < 0) { ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno)); unlink(libdir); |