diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-27 19:47:26 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-11-04 09:49:53 +0100 |
commit | 961b341e8537a69455c130b98b50f51ed011e362 (patch) | |
tree | c15b35269473145bfc10572a317a00366371e2dd /src | |
parent | ae5e9bf46f2abd2cca22dd5836e85bd93dc50193 (diff) | |
download | systemd-961b341e8537a69455c130b98b50f51ed011e362.tar.gz |
selinux: also try the netlink-based fallback and continue on permission error
Fedora Rawhide still has the old policy, so selinux prevents our selinux code
from checking if selinux is enabled. But it seems smart to fall back to the old
API anyway.
Follow-up for fd5e402fa9377f2860e02bdb5b84d5f5942e73f4.
Both the reference policy [1] and Fedora selinux policy [2] needed to be
updated, so it's likely that this will impact other distros too.
[1] https://github.com/SELinuxProject/refpolicy/pull/308
[2] https://github.com/fedora-selinux/selinux-policy/pull/464
Diffstat (limited to 'src')
-rw-r--r-- | src/basic/selinux-util.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c index 1791aeecde..72fa50ffdc 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -133,6 +133,7 @@ static int open_label_db(void) { int mac_selinux_init(void) { #if HAVE_SELINUX int r; + bool have_status_page = false; if (initialized) return 0; @@ -140,9 +141,15 @@ int mac_selinux_init(void) { if (!mac_selinux_use()) return 0; - r = selinux_status_open(/* no netlink fallback */ 0); - if (r < 0) - return log_enforcing_errno(errno, "Failed to open SELinux status page: %m"); + r = selinux_status_open(/* netlink fallback */ 1); + if (r < 0) { + if (!ERRNO_IS_PRIVILEGE(errno)) + return log_enforcing_errno(errno, "Failed to open SELinux status page: %m"); + log_warning_errno(errno, "selinux_status_open() with netlink fallback failed, not checking for policy reloads: %m"); + } else if (r == 1) + log_warning("selinux_status_open() failed to open the status page, using the netlink fallback."); + else + have_status_page = true; r = open_label_db(); if (r < 0) { @@ -150,13 +157,14 @@ int mac_selinux_init(void) { return r; } - /* save the current policyload sequence number, so `mac_selinux_maybe_reload()` does - not trigger on first call without any actual change */ + /* Save the current policyload sequence number, so mac_selinux_maybe_reload() does not trigger on + * first call without any actual change. */ last_policyload = selinux_status_policyload(); - /* now that the SELinux status page has been successfully opened, - retrieve the enforcing status over it (to avoid system calls in `security_getenforce()`) */ - enforcing_status_func = selinux_status_getenforce; + if (have_status_page) + /* Now that the SELinux status page has been successfully opened, retrieve the enforcing + * status over it (to avoid system calls in security_getenforce()). */ + enforcing_status_func = selinux_status_getenforce; initialized = true; #endif |