diff options
| author | Nikita Ioffe <ioffe@google.com> | 2023-06-16 14:38:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-16 14:38:58 +0000 |
| commit | 7acef819583250ed86951fcee84bba1b290c3442 (patch) | |
| tree | 6f3626619241de79786e50bab960feffaffbd2c0 | |
| parent | 630c8c01c5fc481922bb33257bb38f708750ecab (diff) | |
| parent | f8cf22eba81b28f0f460f5cba8a69223a1f23a87 (diff) | |
| download | selinux-7acef819583250ed86951fcee84bba1b290c3442.tar.gz | |
selinux_android_restorecon: log if selinux is disabled am: f8cf22eba8android-u-beta-4-gpl
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2628031
Change-Id: Iec5a861f6a1305e86a0afdd00191734ad967c9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libselinux/src/android/android_device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libselinux/src/android/android_device.c b/libselinux/src/android/android_device.c index 0cac8023..5d1c4d31 100644 --- a/libselinux/src/android/android_device.c +++ b/libselinux/src/android/android_device.c @@ -633,8 +633,10 @@ static int selinux_android_restorecon_common(const char* pathname_orig, ftsflags |= FTS_XDEV; } - if (is_selinux_enabled() <= 0) + if (is_selinux_enabled() <= 0) { + selinux_log(SELINUX_WARNING, "SELinux: SELinux is disabled, skipping restorecon"); return 0; + } __selinux_once(fc_once, file_context_init); |