am 236ed6d3: am 82fb5809: Merge "restorecon the profile directory."

* commit '236ed6d3d376b12573cca6878d3b5013371f5bc8':
  restorecon the profile directory.
This commit is contained in:
Nick Kralevich 2014-04-09 19:49:43 +00:00 committed by Android Git Automerger
commit db1d823b4c

View File

@ -1022,7 +1022,13 @@ int create_profile_file(const char *pkgname, gid_t gid) {
// Make the profile directory write-only for group and other. Owner can rwx it. // Make the profile directory write-only for group and other. Owner can rwx it.
if (chmod(profile_dir, 0711) < 0) { if (chmod(profile_dir, 0711) < 0) {
ALOGE("cannot chown profile dir '%s': %s\n", profile_dir, strerror(errno)); ALOGE("cannot chown profile dir '%s': %s\n", profile_dir, strerror(errno));
unlink(profile_dir); rmdir(profile_dir);
return -1;
}
if (selinux_android_restorecon(profile_dir, 0) < 0) {
ALOGE("cannot restorecon profile dir '%s': %s\n", profile_dir, strerror(errno));
rmdir(profile_dir);
return -1; return -1;
} }
} }