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 | 20 |
1 files changed, 10 insertions, 10 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 1b3180b..04859f1 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 c885e42eb7f904c672d18899586f1d6498fbf16e Mon Sep 17 00:00:00 2001 +From f29dd9ddc7a2659e67f7f3ddfbf087a7729fd012 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/9] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/8] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index c7900e8975f1..ca4e43b7f31f 100644 +index 532362fcfe31..f13bb9f371a2 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1235,6 +1235,22 @@ config USER_NS +@@ -1241,6 +1241,22 @@ config USER_NS If unsure, say N. @@ -63,7 +63,7 @@ index c7900e8975f1..ca4e43b7f31f 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index d587c85f35b1..3d8e44ef18e5 100644 +index 2b6bd511c6ed..704fe6bc9cb4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -99,6 +99,10 @@ @@ -77,7 +77,7 @@ index d587c85f35b1..3d8e44ef18e5 100644 #include <asm/pgalloc.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> -@@ -1996,6 +2000,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -2009,6 +2013,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 d587c85f35b1..3d8e44ef18e5 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3144,6 +3152,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3159,6 +3167,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,7 +102,7 @@ index d587c85f35b1..3d8e44ef18e5 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 35d034219513..8e2c7326f0e8 100644 +index 205d605cacc5..d7247ec7ddda 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -81,6 +81,9 @@ @@ -115,7 +115,7 @@ index 35d034219513..8e2c7326f0e8 100644 #if defined(CONFIG_SYSCTL) -@@ -1608,6 +1611,15 @@ static struct ctl_table kern_table[] = { +@@ -1649,6 +1652,15 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, @@ -150,5 +150,5 @@ index 5481ba44a8d6..423ab2563ad7 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.37.2 +2.38.1 |