X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fselinux-setup.c;h=620c49e686a56646ba25cc01b0d69bee9b842908;hb=6c7506dca32f8add56cd03bf263f417305de74a0;hp=d4da693ca473485def0923e7b365d3ba348712a1;hpb=c4dcdb9f4785937f2b73700e66b8cafa452f60a7;p=elogind.git diff --git a/src/selinux-setup.c b/src/selinux-setup.c index d4da693ca..620c49e68 100644 --- a/src/selinux-setup.c +++ b/src/selinux-setup.c @@ -37,13 +37,32 @@ int selinux_setup(char *const argv[]) { #ifdef HAVE_SELINUX int enforce = 0; + usec_t n; + security_context_t con; /* Already initialized? */ - if (path_is_mount_point("/selinux") > 0) - return 0; + if (getcon_raw(&con) == 0) { + bool initialized; + initialized = !streq(con, "kernel"); + freecon(con); + + if (initialized) + return 0; + } + + /* Before we load the policy we create a flag file to ensure + * that after the reexec we iterate through /run and /dev to + * relabel things. */ + touch("/dev/.systemd-relabel-run-dev"); + + n = now(CLOCK_MONOTONIC); if (selinux_init_load_policy(&enforce) == 0) { - log_info("Successfully loaded SELinux policy, reexecuting."); + char buf[FORMAT_TIMESPAN_MAX]; + + n = now(CLOCK_MONOTONIC) - n; + log_info("Successfully loaded SELinux policy in %s, reexecuting.", + format_timespan(buf, sizeof(buf), n)); /* FIXME: Ideally we'd just call setcon() here instead * of having to reexecute ourselves here. */ @@ -53,7 +72,9 @@ int selinux_setup(char *const argv[]) { return -errno; } else { - log_full(enforce > 0 ? LOG_ERR : LOG_DEBUG, "Failed to load SELinux policy."); + log_full(enforce > 0 ? LOG_ERR : LOG_WARNING, "Failed to load SELinux policy."); + + unlink("/dev/.systemd-relabel-run-dev"); if (enforce > 0) return -EIO;