diff options
| author | Nick Kralevich <nnk@google.com> | 2011-04-19 10:10:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-19 10:10:54 -0700 |
| commit | 08d1f937236230756bffde241ad6b335da368cf9 (patch) | |
| tree | f8cf94503698be7605dd6b7675bb4eab137a3ad0 | |
| parent | 7f9968c2ef07f7bff15b396f6d17f6fb2676aef5 (diff) | |
| parent | f68327e7e23d78e209acc76ccecbc4601e3f5fc2 (diff) | |
| download | frameworks_base-08d1f937236230756bffde241ad6b335da368cf9.zip frameworks_base-08d1f937236230756bffde241ad6b335da368cf9.tar.gz frameworks_base-08d1f937236230756bffde241ad6b335da368cf9.tar.bz2 | |
Merge "Make installd resistant to umask changes."
| -rw-r--r-- | cmds/installd/commands.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 80ba1e9..9c9c5c4 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -48,6 +48,11 @@ int install(const char *pkgname, uid_t uid, gid_t gid) LOGE("cannot create dir '%s': %s\n", pkgdir, strerror(errno)); return -errno; } + if (chmod(pkgdir, 0751) < 0) { + LOGE("cannot chmod dir '%s': %s\n", pkgdir, strerror(errno)); + unlink(pkgdir); + return -errno; + } if (chown(pkgdir, uid, gid) < 0) { LOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno)); unlink(pkgdir); @@ -58,6 +63,12 @@ int install(const char *pkgname, uid_t uid, gid_t gid) unlink(pkgdir); return -errno; } + if (chmod(libdir, 0755) < 0) { + LOGE("cannot chmod dir '%s': %s\n", libdir, strerror(errno)); + unlink(libdir); + unlink(pkgdir); + return -errno; + } if (chown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) { LOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno)); unlink(libdir); |