openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels." 

* commit '9492db23b9feeb589be36fece46e55dc66d7f1dd':
  Not all filesystems support setting SELinux labels.
This commit is contained in:
Elliott Hughes 2015-08-26 00:30:33 +00:00 committed by Android Git Automerger
parent 9e8eb9930b 9492db23b9
commit 4f2015a155
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adb/file_sync_service.cpp
View File

@ -71,6 +71,7 @@ static bool secure_mkdirs(const std::string& path) {
if (chown(partial_path.c_str(), uid, gid) == -1) {
return false;
}
// Not all filesystems support setting SELinux labels. http://b/23530370.
selinux_android_restorecon(partial_path.c_str(), 0);
}
}
@ -166,10 +167,8 @@ static bool handle_send_file(int s, const char* path, uid_t uid,
goto fail;
}
if (selinux_android_restorecon(path, 0) == -1) {
SendSyncFailErrno(s, "selinux_android_restorecon failed");
goto fail;
}
// Not all filesystems support setting SELinux labels. http://b/23530370.
selinux_android_restorecon(path, 0);
// fchown clears the setuid bit - restore it if present.
// Ignore the result of calling fchmod. It's not supported