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

Merge "Make lib dir before changing ownership of app dir" into jb-dev

Browse Source
This commit is contained in:
Kenny Root
2012-06-15 12:37:39 -07:00
committed by Android (Google) Code Review
parent 27db797e37 4503cf67b5
commit 4de60b2609
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmds/installd/commands.c
View File

@@ -53,11 +53,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
unlink(pkgdir); unlink(pkgdir);
return -errno; return -errno;
} }
if (chown(pkgdir, uid, gid) < 0) {
ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
unlink(pkgdir);
return -errno;
}
if (mkdir(libdir, 0755) < 0) { if (mkdir(libdir, 0755) < 0) {
ALOGE("cannot create dir '%s': %s\n", libdir, strerror(errno)); ALOGE("cannot create dir '%s': %s\n", libdir, strerror(errno));
unlink(pkgdir); unlink(pkgdir);
@@ -75,6 +71,13 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
unlink(pkgdir); unlink(pkgdir);
return -errno; return -errno;
} }
if (chown(pkgdir, uid, gid) < 0) {
ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
unlink(libdir);
unlink(pkgdir);
return -errno;
}
return 0; return 0;
} }