ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 43f43d87: Merge "Move adb\'s selinux_android_restorecon up and check for failures."

Browse source 
* commit '43f43d8792ffc91df085a787feecdb0cfd225b47':
  Move adb's selinux_android_restorecon up and check for failures.
This commit is contained in:
Elliott Hughes 2015-08-25 20:34:17 +00:00 • committed by Android Git Automerger
commit 1ce12d397f
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; goto fail;
} }
// fchown clears the setuid bit - restore it if present. if (selinux_android_restorecon(path, 0) == -1) {
// Ignore the result of calling fchmod. It's not supported SendSyncFailErrno(s, "selinux_android_restorecon failed");
// by all filesystems. b/12441485 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); fchmod(fd, mode);
} }
@ -201,8 +206,6 @@ static bool handle_send_file(int s, const char* path, uid_t uid,
adb_close(fd); adb_close(fd);
selinux_android_restorecon(path, 0);
utimbuf u; utimbuf u;
u.actime = timestamp; u.actime = timestamp;
u.modtime = timestamp; u.modtime = timestamp;