summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-07-31 09:36:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-31 09:36:17 -0700
commit00efe44923af27094cfc201064ed920f93b0bde0 (patch)
tree262eca9afafe36ecd55ee4e2202466244e7b4acd /cmds
parent36b536be60b48ba119c85d7c4a1bed41a30fb4b1 (diff)
parentb3e4b46db028c35d6d12c5f8f25b0463833fb51d (diff)
downloadframeworks_base-00efe44923af27094cfc201064ed920f93b0bde0.zip
frameworks_base-00efe44923af27094cfc201064ed920f93b0bde0.tar.gz
frameworks_base-00efe44923af27094cfc201064ed920f93b0bde0.tar.bz2
am b3e4b46d: am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev
* commit 'b3e4b46db028c35d6d12c5f8f25b0463833fb51d': Explicitly set lib dir permissions during unlink
Diffstat (limited to 'cmds')
-rw-r--r--cmds/installd/commands.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 5878619..d94daf7 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -1093,7 +1093,12 @@ int unlinklib(const char* dataDir)
rc = -errno;
goto out;
}
-
+ if (chmod(libdir, 0755) < 0) {
+ ALOGE("cannot chmod dir '%s': %s\n", libdir, strerror(errno));
+ unlink(libdir);
+ rc = -errno;
+ goto out;
+ }
if (chown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) {
ALOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno));
unlink(libdir);