Skip to content

Commit 00efe44

Browse files
krutonAndroid Git Automerger
authored andcommitted
am b3e4b46: am e583bcf: Merge "Explicitly set lib dir permissions during unlink" into jb-dev
* commit 'b3e4b46db028c35d6d12c5f8f25b0463833fb51d': Explicitly set lib dir permissions during unlink
2 parents 36b536b + b3e4b46 commit 00efe44

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

cmds/installd/commands.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,12 @@ int unlinklib(const char* dataDir)
10931093
rc = -errno;
10941094
goto out;
10951095
}
1096-
1096+
if (chmod(libdir, 0755) < 0) {
1097+
ALOGE("cannot chmod dir '%s': %s\n", libdir, strerror(errno));
1098+
unlink(libdir);
1099+
rc = -errno;
1100+
goto out;
1101+
}
10971102
if (chown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) {
10981103
ALOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno));
10991104
unlink(libdir);

0 commit comments

Comments
 (0)