summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2012-03-15 19:06:10 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-22 00:20:48 +0100
commit160481f68d0a5f26f75c04fb576fb854fd5416a5 (patch)
tree9a88768729824f52fc434cbff467861a83faa8fe /src
parent7264278fbbdc1dc6c30fedc902d1337594aa6ff6 (diff)
systemd: mount the securityfs filesystem at early stage
This is an S/MIME signed message The mount of the securityfs filesystem is now performed in the main systemd executable as it is used by IMA to provide the interface for loading custom policies. The unit file 'units/sys-kernel-security.mount' has been removed because it is not longer necessary. Signed-off-by: Roberto Sassu <roberto.sassu@polito.it> Acked-by: Gianluca Ramunno <ramunno@polito.it>
Diffstat (limited to 'src')
-rw-r--r--src/mount-setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mount-setup.c b/src/mount-setup.c
index 7c14ea8e55..aaffb655ee 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -51,13 +51,15 @@ typedef struct MountPoint {
} MountPoint;
/* The first three entries we might need before SELinux is up. The
- * other ones we can delay until SELinux is loaded. */
-#define N_EARLY_MOUNT 3
+ * fourth (securityfs) is needed by IMA to load a custom policy. The
+ * other ones we can delay until SELinux and IMA are loaded. */
+#define N_EARLY_MOUNT 4
static const MountPoint mount_table[] = {
{ "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
{ "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
{ "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true },
+ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
{ "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV, true },
{ "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false },
{ "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true },