diff options
Diffstat (limited to '0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch')
-rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index a0b24e7689dc..933255adbb92 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From b7ea2fa503702cbbd1eb2d38371b5650aab88666 Mon Sep 17 00:00:00 2001 +From b38ba076b5049a77bf79f2c8cd224a77dea89bf3 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 01/13] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -13,10 +13,10 @@ Our default behavior continues to match the vanilla kernel. 4 files changed, 50 insertions(+) diff --git a/init/Kconfig b/init/Kconfig -index 74297c392dd4..44221292a9eb 100644 +index 4f717bfdbfe2..bdc75cbd3d2d 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1102,6 +1102,22 @@ config USER_NS +@@ -1110,6 +1110,22 @@ config USER_NS If unsure, say N. @@ -40,7 +40,7 @@ index 74297c392dd4..44221292a9eb 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 080809560072..1cb7b827b57b 100644 +index d90af13431c7..b4798ff6eb15 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -106,6 +106,11 @@ @@ -55,7 +55,7 @@ index 080809560072..1cb7b827b57b 100644 /* * Minimum number of threads to boot the kernel -@@ -1843,6 +1848,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1844,6 +1849,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -66,7 +66,7 @@ index 080809560072..1cb7b827b57b 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2923,6 +2932,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2933,6 +2942,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -80,7 +80,7 @@ index 080809560072..1cb7b827b57b 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 70665934d53e..9797869ed829 100644 +index ad5b88a53c5a..8f00d26b7b59 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -110,6 +110,9 @@ extern int core_uses_pid; @@ -128,5 +128,5 @@ index 8eadadc478f9..c36ecd19562c 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.26.0 +2.26.2 |