From f5c1b9eeb94c112e5dac09fc6a47c571356c30c0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Jul 2011 21:57:56 +0200 Subject: [PATCH] nspawn: always use bind mounts to make API file systems available in the container This ensures that read-only flags are never passed from the container to the host OS. --- src/nspawn.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/nspawn.c b/src/nspawn.c index 50d7c2e28..8ee940c2b 100644 --- a/src/nspawn.c +++ b/src/nspawn.c @@ -124,15 +124,17 @@ static int mount_all(const char *dest) { } MountPoint; static const MountPoint mount_table[] = { - { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ - { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ - { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true }, + { "/proc", "/proc", "bind", NULL, MS_BIND, true }, + { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ + { "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ + { "/sys", "/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */ + { "/sys", "/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */ { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID, true }, { "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true }, { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true }, #ifdef HAVE_SELINUX - { "selinux", "/selinux", "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false }, + { "/selinux", "/selinux", "bind", NULL, MS_BIND, false }, /* Bind mount first */ + { "/selinux", "/selinux", "selinuxfs", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false }, /* Then, make it r/o */ #endif }; @@ -739,6 +741,10 @@ int main(int argc, char *argv[]) { if (prctl(PR_SET_PDEATHSIG, SIGKILL) < 0) goto child_fail; + /* Mark / as private, in case somebody marked it shared */ + if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) + goto child_fail; + if (mount_all(arg_directory) < 0) goto child_fail; -- 2.30.2