diff options
Diffstat (limited to 'libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch')
| -rw-r--r-- | libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 5e275b0c8..8c6bfa8cb 100644 --- a/libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -14,10 +14,10 @@ Our default behavior continues to match the vanilla kernel. 5 files changed, 53 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 7616c7bf4b24..bdbfcfe5df1e 100644 +index 45f09bec02c4..87b20e2ee274 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h -@@ -109,6 +109,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type); +@@ -148,6 +148,8 @@ static inline void set_userns_rlimit_max(struct user_namespace *ns, #ifdef CONFIG_USER_NS @@ -26,7 +26,7 @@ index 7616c7bf4b24..bdbfcfe5df1e 100644 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) { if (ns) -@@ -142,6 +144,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); +@@ -181,6 +183,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); struct ns_common *ns_get_owner(struct ns_common *ns); #else @@ -36,10 +36,10 @@ index 7616c7bf4b24..bdbfcfe5df1e 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index fc4c9f416fad..3707cc8b4d7b 100644 +index de255842f5d0..4e028c5c976b 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1172,6 +1172,22 @@ config USER_NS +@@ -1248,6 +1248,22 @@ config USER_NS If unsure, say N. @@ -63,12 +63,12 @@ index fc4c9f416fad..3707cc8b4d7b 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 7c044d377926..3c70b2fe5946 100644 +index 41950ff90aa3..af4961b85f91 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -97,6 +97,10 @@ - #include <linux/scs.h> +@@ -98,6 +98,10 @@ #include <linux/io_uring.h> + #include <linux/bpf.h> +#ifdef CONFIG_USER_NS +#include <linux/user_namespace.h> @@ -77,7 +77,7 @@ index 7c044d377926..3c70b2fe5946 100644 #include <asm/pgalloc.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> -@@ -1871,6 +1875,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -2014,6 +2018,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 7c044d377926..3c70b2fe5946 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2936,6 +2944,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3173,6 +3181,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,23 +102,23 @@ index 7c044d377926..3c70b2fe5946 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index b9306d2bb426..891b250db88e 100644 +index c6d9dec11b74..9a4514ad481b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -103,6 +103,9 @@ - #ifdef CONFIG_LOCKUP_DETECTOR - #include <linux/nmi.h> +@@ -81,6 +81,9 @@ + #ifdef CONFIG_RT_MUTEXES + #include <linux/rtmutex.h> #endif +#ifdef CONFIG_USER_NS +#include <linux/user_namespace.h> +#endif - #if defined(CONFIG_SYSCTL) - -@@ -1902,6 +1905,15 @@ static struct ctl_table kern_table[] = { + /* shared constants to be used in various sysctls */ + const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 }; +@@ -1659,6 +1662,15 @@ static struct ctl_table kern_table[] = { + .mode = 0644, .proc_handler = proc_dointvec, }, - #endif +#ifdef CONFIG_USER_NS + { + .procname = "unprivileged_userns_clone", @@ -132,10 +132,10 @@ index b9306d2bb426..891b250db88e 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index ce396ea4de60..c3a6ef1f10ed 100644 +index 54211dbd516c..16ca0c151629 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c -@@ -21,6 +21,13 @@ +@@ -22,6 +22,13 @@ #include <linux/bsearch.h> #include <linux/sort.h> |