chiark / gitweb /
selinux: automatically load policy if the initrd hasn't done this for us yet
authorLennart Poettering <lennart@poettering.net>
Wed, 27 Oct 2010 03:47:02 +0000 (05:47 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 27 Oct 2010 03:47:02 +0000 (05:47 +0200)
Makefile.am
src/label.c
src/main.c
src/selinux-setup.c [new file with mode: 0644]
src/selinux-setup.h [new file with mode: 0644]

index 5c4a2e7..e079ac8 100644 (file)
@@ -399,6 +399,7 @@ libsystemd_core_la_SOURCES = \
        src/cgroup.c \
        src/mount-setup.c \
        src/hostname-setup.c \
+       src/selinux-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
index 809b1ee..01f36eb 100644 (file)
@@ -51,6 +51,9 @@ int label_init(void) {
         if (!use_selinux())
                 return 0;
 
+        if (label_hnd)
+                return 0;
+
         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
         if (!label_hnd) {
                 log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
index 83cf2e7..f7d76a2 100644 (file)
@@ -39,6 +39,7 @@
 #include "loopback-setup.h"
 #include "kmod-setup.h"
 #include "locale-setup.h"
+#include "selinux-setup.h"
 #include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"
@@ -895,6 +896,11 @@ int main(int argc, char *argv[]) {
                 arg_running_as = MANAGER_SYSTEM;
                 log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
 
+                /* This might actually not return, but cause a
+                 * reexecution */
+                if (selinux_setup(argv) < 0)
+                        goto finish;
+
                 if (label_init() < 0)
                         goto finish;
         } else {
diff --git a/src/selinux-setup.c b/src/selinux-setup.c
new file mode 100644 (file)
index 0000000..d4da693
--- /dev/null
@@ -0,0 +1,64 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef HAVE_SELINUX
+#include <selinux/selinux.h>
+#endif
+
+#include "selinux-setup.h"
+#include "macro.h"
+#include "util.h"
+#include "log.h"
+
+int selinux_setup(char *const argv[]) {
+#ifdef HAVE_SELINUX
+       int enforce = 0;
+
+       /* Already initialized? */
+       if (path_is_mount_point("/selinux") > 0)
+               return 0;
+
+       if (selinux_init_load_policy(&enforce) == 0) {
+               log_info("Successfully loaded SELinux policy, reexecuting.");
+
+               /* FIXME: Ideally we'd just call setcon() here instead
+                * of having to reexecute ourselves here. */
+
+               execv(SYSTEMD_BINARY_PATH, argv);
+               log_error("Failed to reexecute: %m");
+               return -errno;
+
+       } else {
+               log_full(enforce > 0 ? LOG_ERR : LOG_DEBUG, "Failed to load SELinux policy.");
+
+               if (enforce > 0)
+                       return -EIO;
+       }
+#endif
+
+       return 0;
+}
diff --git a/src/selinux-setup.h b/src/selinux-setup.h
new file mode 100644 (file)
index 0000000..53dbb65
--- /dev/null
@@ -0,0 +1,27 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef fooselinuxsetuphfoo
+#define fooselinuxsetuphfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+int selinux_setup(char *const argv[]);
+
+#endif