Skip to content

Commit 4503cf6

Browse files
committed
Make lib dir before changing ownership of app dir
Bug: 6668897 Change-Id: I8998a50359892277b15e80b5b5590ff94b125467
1 parent 9632189 commit 4503cf6

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

cmds/installd/commands.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
5353
unlink(pkgdir);
5454
return -errno;
5555
}
56-
if (chown(pkgdir, uid, gid) < 0) {
57-
ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
58-
unlink(pkgdir);
59-
return -errno;
60-
}
56+
6157
if (mkdir(libdir, 0755) < 0) {
6258
ALOGE("cannot create dir '%s': %s\n", libdir, strerror(errno));
6359
unlink(pkgdir);
@@ -75,6 +71,13 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
7571
unlink(pkgdir);
7672
return -errno;
7773
}
74+
75+
if (chown(pkgdir, uid, gid) < 0) {
76+
ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
77+
unlink(libdir);
78+
unlink(pkgdir);
79+
return -errno;
80+
}
7881
return 0;
7982
}
8083

0 commit comments

Comments
 (0)