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

Merge "Avoid two SELinux related error messages at boot time" into main am: 87d6c8a1d5 am: 5236858bf8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705761

Change-Id: I7ec4686b70c57b3318f63e5f34ea9a277dd89ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2023-08-14 19:38:24 +00:00 • committed by Automerger Merge Worker
commit db34b3e5e3
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/selinux.cpp
View file

@ -735,6 +735,14 @@ void SelinuxAvcLog(char* buf) {
TEMP_FAILURE_RETRY(send(fd.get(), &request, sizeof(request), 0));
}
int RestoreconIfExists(const char* path, unsigned int flags) {
if (access(path, F_OK) != 0 && errno == ENOENT) {
// Avoid error message for path that is expected to not always exist.
return 0;
}
return selinux_android_restorecon(path, flags);
}
} // namespace
void SelinuxRestoreContext() {
@ -762,9 +770,9 @@ void SelinuxRestoreContext() {
// adb remount, snapshot-based updates, and DSUs all create files during
// first-stage init.
selinux_android_restorecon(SnapshotManager::GetGlobalRollbackIndicatorPath().c_str(), 0);
selinux_android_restorecon("/metadata/gsi", SELINUX_ANDROID_RESTORECON_RECURSE |
SELINUX_ANDROID_RESTORECON_SKIP_SEHASH);
RestoreconIfExists(SnapshotManager::GetGlobalRollbackIndicatorPath().c_str(), 0);
RestoreconIfExists("/metadata/gsi",
SELINUX_ANDROID_RESTORECON_RECURSE | SELINUX_ANDROID_RESTORECON_SKIP_SEHASH);
}
int SelinuxKlogCallback(int type, const char* fmt, ...) {