Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mistaken removal of setfilecon"

Browse Source
This commit is contained in:
Kenny Root
2012-10-17 09:57:15 -07:00
committed by Gerrit Code Review
parent 85f9ba9e7f 57c63d8f9b
commit 40f2f751ac
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmds/installd/commands.c
View File

@@ -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);