diff options
Diffstat (limited to 'libre/linux-libre-64/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch')
| -rw-r--r-- | libre/linux-libre-64/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libre/linux-libre-64/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-64/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index e738fbcc2..a1c62dc7f 100644 --- a/libre/linux-libre-64/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre-64/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 2f86b241c391ebf7a3ae688e4af4f40a1d85bc7a Mon Sep 17 00:00:00 2001 +From 9baf57b4c2d9348bd5adecbb893870d1d79fade1 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/6] 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. @@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index 11f8a845f259..02b7a0e455a5 100644 +index b19e2eeaae80..2c2e01d76076 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1226,6 +1226,22 @@ config USER_NS +@@ -1240,6 +1240,22 @@ config USER_NS If unsure, say N. @@ -63,12 +63,12 @@ index 11f8a845f259..02b7a0e455a5 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 10885c649ca4..e0fe98e1afbd 100644 +index 0d8abfb9e0f4..bd7c215e315f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -98,6 +98,10 @@ - #include <linux/io_uring.h> +@@ -99,6 +99,10 @@ #include <linux/bpf.h> + #include <linux/sched/mm.h> +#ifdef CONFIG_USER_NS +#include <linux/user_namespace.h> @@ -77,7 +77,7 @@ index 10885c649ca4..e0fe98e1afbd 100644 #include <asm/pgalloc.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> -@@ -1950,6 +1954,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1992,6 +1996,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 10885c649ca4..e0fe98e1afbd 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3056,6 +3064,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3128,6 +3136,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,12 +102,12 @@ index 10885c649ca4..e0fe98e1afbd 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 083be6af29d7..42aa3c7835b9 100644 +index 830aaf8ca08e..af4c0806bd8e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -105,6 +105,9 @@ - #ifdef CONFIG_LOCKUP_DETECTOR - #include <linux/nmi.h> +@@ -91,6 +91,9 @@ + #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) + #include <linux/lockdep.h> #endif +#ifdef CONFIG_USER_NS +#include <linux/user_namespace.h> @@ -115,10 +115,10 @@ index 083be6af29d7..42aa3c7835b9 100644 #if defined(CONFIG_SYSCTL) -@@ -1949,6 +1952,15 @@ static struct ctl_table kern_table[] = { +@@ -1803,6 +1806,15 @@ static struct ctl_table kern_table[] = { + .mode = 0644, .proc_handler = proc_dointvec, }, - #endif +#ifdef CONFIG_USER_NS + { + .procname = "unprivileged_userns_clone", @@ -132,7 +132,7 @@ index 083be6af29d7..42aa3c7835b9 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 6b2e3ca7ee99..0253002184f1 100644 +index 5481ba44a8d6..423ab2563ad7 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -21,6 +21,13 @@ @@ -150,5 +150,5 @@ index 6b2e3ca7ee99..0253002184f1 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.34.1 +2.36.1 |