diff options
| author | graysky | 2020-06-06 03:13:17 -0400 |
|---|---|---|
| committer | graysky | 2020-06-06 03:13:17 -0400 |
| commit | 292ed3552d61cab15870b409842f03e986ac7f7c (patch) | |
| tree | 1bf6adc6264d464ea56f3dc5d87fd8a96f96b46c /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | |
| parent | 208490bdccf92b059afd520f0d1120b9b7bb7feb (diff) | |
| download | aur-292ed3552d61cab15870b409842f03e986ac7f7c.tar.gz | |
Update to 5.7.1rc1-1
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 dbd5ac181817..6293092bc1f6 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 f1107f172c74a9a8550a9e566c525ef28dbc139f Mon Sep 17 00:00:00 2001 +From 16945cf3f9e403f531985ba425118584d27414f1 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/7] 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 4f717bfdbfe2..bdc75cbd3d2d 100644 +index 74a5ac65644f..965a628556e8 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1110,6 +1110,22 @@ config USER_NS +@@ -1102,6 +1102,22 @@ config USER_NS If unsure, say N. @@ -40,7 +40,7 @@ index 4f717bfdbfe2..bdc75cbd3d2d 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index d90af13431c7..b4798ff6eb15 100644 +index 48ed22774efa..ec61454a18d5 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -106,6 +106,11 @@ @@ -55,7 +55,7 @@ index d90af13431c7..b4798ff6eb15 100644 /* * Minimum number of threads to boot the kernel -@@ -1844,6 +1849,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1848,6 +1853,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 d90af13431c7..b4798ff6eb15 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2933,6 +2942,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2948,6 +2957,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -80,7 +80,7 @@ index d90af13431c7..b4798ff6eb15 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index ad5b88a53c5a..8f00d26b7b59 100644 +index 8a176d8727a3..9500597739a2 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -110,6 +110,9 @@ extern int core_uses_pid; @@ -93,7 +93,7 @@ index ad5b88a53c5a..8f00d26b7b59 100644 extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -546,6 +549,15 @@ static struct ctl_table kern_table[] = { +@@ -534,6 +537,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -128,5 +128,5 @@ index 8eadadc478f9..c36ecd19562c 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.26.2 +2.27.0 |