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

Set file capabilities after writing file data 

File capabilities will be cleared if we set them before writing file data.

Bug: 32543395

Change-Id: I88cc0a0ec23cd6fc6dbe86c93a76914809d7e5f9
This commit is contained in:
Jin Qian 2016-11-02 16:27:17 -07:00
parent 0945380e36
commit d0515e7165
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adb/file_sync_service.cpp
View File

@ -198,11 +198,6 @@ static bool handle_send_file(int s, const char* path, uid_t uid, gid_t gid, uint
// Ignore the result of calling fchmod. It's not supported
// by all filesystems, so we don't check for success. b/12441485
fchmod(fd, mode);
if (!update_capabilities(path, capabilities)) {
SendSyncFailErrno(s, "update_capabilities failed");
goto fail;
}
}
while (true) {
@ -232,6 +227,11 @@ static bool handle_send_file(int s, const char* path, uid_t uid, gid_t gid, uint
adb_close(fd);
if (!update_capabilities(path, capabilities)) {
SendSyncFailErrno(s, "update_capabilities failed");
goto fail;
}
utimbuf u;
u.actime = timestamp;
u.modtime = timestamp;