summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/patches/progress-linux/0002-proc-hidepid.patch27
-rw-r--r--debian/patches/series1
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0002-proc-hidepid.patch b/debian/patches/progress-linux/0002-proc-hidepid.patch
new file mode 100644
index 0000000..2b74268
--- /dev/null
+++ b/debian/patches/progress-linux/0002-proc-hidepid.patch
@@ -0,0 +1,27 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Mounting /proc with hidepid=2 option.
+
+diff -Naurp systemd.orig/src/nspawn/nspawn-mount.c systemd/src/nspawn/nspawn-mount.c
+--- systemd.orig/src/nspawn/nspawn-mount.c
++++ systemd/src/nspawn/nspawn-mount.c
+@@ -513,7 +513,7 @@ int mount_all(const char *dest,
+
+ static const MountPoint mount_table[] = {
+ /* First we list inner child mounts (i.e. mounts applied *after* entering user namespacing) */
+- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
++ { "proc", "/proc", "proc", "hidepid=2", MS_NOSUID|MS_NOEXEC|MS_NODEV,
+ MOUNT_FATAL|MOUNT_IN_USERNS|MOUNT_MKDIR|MOUNT_FOLLOW_SYMLINKS }, /* we follow symlinks here since not following them requires /proc/ already being mounted, which we don't have here. */
+
+ { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND,
+diff -Naurp systemd.orig/src/shared/mount-setup.c systemd/src/shared/mount-setup.c
+--- systemd.orig/src/shared/mount-setup.c
++++ systemd/src/shared/mount-setup.c
+@@ -62,7 +62,7 @@ typedef struct MountPoint {
+ #endif
+
+ static const MountPoint mount_table[] = {
+- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
++ { "proc", "/proc", "proc", "hidepid=2", MS_NOSUID|MS_NOEXEC|MS_NODEV,
+ NULL, MNT_FATAL|MNT_IN_CONTAINER|MNT_FOLLOW_SYMLINK },
+ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
+ NULL, MNT_FATAL|MNT_IN_CONTAINER },
diff --git a/debian/patches/series b/debian/patches/series
index 438f54d..f160335 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ debian/systemctl-do-not-shutdown-immediately-on-scheduled-shutdo.patch
debian/Downgrade-a-couple-of-warnings-to-debug.patch
debian/Skip-flaky-test_resolved_domain_restricted_dns-in-network.patch
progress-linux/0001-agetty-nohostname.patch
+progress-linux/0002-proc-hidepid.patch