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 8f92b6c86bc4..cf6bb231ce03 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 c3517e2c26868cad0fda418a8815b2e0b818bf92 Mon Sep 17 00:00:00 2001 +From 3a8bc83f97cb4ef7ad72a742382f373357d4d95b 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 1/5] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -36,10 +36,10 @@ index 6ef1c7109fc4..2140091b0b8d 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index 2a5df1cf838c..bdaf777b9976 100644 +index 0872a5a2e759..a40d8afeb1bb 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1169,6 +1169,22 @@ config USER_NS +@@ -1173,6 +1173,22 @@ config USER_NS If unsure, say N. @@ -63,7 +63,7 @@ index 2a5df1cf838c..bdaf777b9976 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 5fe09d4e6d6a..36756b715103 100644 +index dc55f68a6ee3..15d29085d1ff 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -97,6 +97,10 @@ @@ -77,7 +77,7 @@ index 5fe09d4e6d6a..36756b715103 100644 #include <asm/pgalloc.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> -@@ -1862,6 +1866,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1863,6 +1867,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -88,7 +88,7 @@ index 5fe09d4e6d6a..36756b715103 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2927,6 +2935,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2928,6 +2936,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -132,7 +132,7 @@ index afad085960b8..a94828fb31c2 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 87804e0371fe..66b5afb0d0ee 100644 +index e703d5d9cbe8..5758274feaee 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -21,6 +21,13 @@ @@ -150,5 +150,5 @@ index 87804e0371fe..66b5afb0d0ee 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.29.2 +2.30.0 |