tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move adb's selinux_android_restorecon up and check for failures."

Browse source
This commit is contained in:
Elliott Hughes 2015-08-25 20:26:59 +00:00 committed by Gerrit Code Review
commit 43f43d8792
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/file_sync_service.cpp
View file

@ -166,9 +166,14 @@ static bool handle_send_file(int s, const char* path, uid_t uid,
goto fail;
}
// fchown clears the setuid bit - restore it if present.
// Ignore the result of calling fchmod. It's not supported
// by all filesystems. b/12441485
if (selinux_android_restorecon(path, 0) == -1) {
SendSyncFailErrno(s, "selinux_android_restorecon failed");
goto fail;
}
// fchown clears the setuid bit - restore it if present.
// Ignore the result of calling fchmod. It's not supported
// by all filesystems. b/12441485
fchmod(fd, mode);
}
@ -201,8 +206,6 @@ static bool handle_send_file(int s, const char* path, uid_t uid,
adb_close(fd);
selinux_android_restorecon(path, 0);
utimbuf u;
u.actime = timestamp;
u.modtime = timestamp;