diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 02:31:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 02:31:13 +0000 |
| commit | f193dffcf0a1ee2ffee7a01e9beb9a7be12f1c86 (patch) | |
| tree | 7d9dc07d81f62c5a8689fcbe0b3c0074112eeb8c /debian | |
| parent | Starting agetty with --nohostname option. (diff) | |
| download | systemd-f193dffcf0a1ee2ffee7a01e9beb9a7be12f1c86.tar.xz systemd-f193dffcf0a1ee2ffee7a01e9beb9a7be12f1c86.zip | |
Mounting /proc with hidepid=2 option.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/progress-linux/0002-proc-hidepid.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
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..b3e946d --- /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/core/mount-setup.c systemd/src/core/mount-setup.c +--- systemd.orig/src/core/mount-setup.c ++++ systemd/src/core/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 -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 +@@ -517,7 +517,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 --git a/debian/patches/series b/debian/patches/series index 99fb698..a5bbdd7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -65,3 +65,4 @@ debian/Revert-udev-fix-memleak.patch debian/Revert-udev-link_update-should-fail-if-the-entry-in-symli.patch debian/Revert-udev-make-algorithm-that-selects-highest-priority-.patch progress-linux/0001-agetty-nohostname.patch +progress-linux/0002-proc-hidepid.patch |