Skip to content

Commit b3e4b46

Browse files
krutonAndroid Git Automerger
authored andcommitted
am e583bcf: Merge "Explicitly set lib dir permissions during unlink" into jb-dev
* commit 'e583bcf13c13957bdf20f8bc5e23258b083b2f51': Explicitly set lib dir permissions during unlink
2 parents 5dcbe63 + e583bcf commit b3e4b46

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
@@ -1094,7 +1094,12 @@ int unlinklib(const char* dataDir)
10941094
rc = -errno;
10951095
goto out;
10961096
}
1097-
1097+
if (chmod(libdir, 0755) < 0) {
1098+
ALOGE("cannot chmod dir '%s': %s\n", libdir, strerror(errno));
1099+
unlink(libdir);
1100+
rc = -errno;
1101+
goto out;
1102+
}
10981103
if (chown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) {
10991104
ALOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno));
11001105
unlink(libdir);

0 commit comments

Comments
 (0)