summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
authorgraysky2020-12-01 17:13:50 -0500
committergraysky2020-12-01 17:13:50 -0500
commit3d92ea1d4a46b014925d28996a0483b19d20562c (patch)
tree2db7bbecb58838219e116a5314cb44499a4e4472 /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
parentc02d1becb7908dbe6080195412eb541d2ae8f2b5 (diff)
downloadaur-3d92ea1d4a46b014925d28996a0483b19d20562c.tar.gz
Update to 5.9.12rc1-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.patch20
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 80364739ab9..31ef86fc54b 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 c7c51372f02b8b45275897e5728ef28a35b82658 Mon Sep 17 00:00:00 2001
+From 730629bfe4efc95aaee0de463ea410e31153cef9 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/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/5] 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 d6a0b31b13dc..2420d38cbfb9 100644
+index 2a5df1cf838c..bdaf777b9976 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1168,6 +1168,22 @@ config USER_NS
+@@ -1169,6 +1169,22 @@ config USER_NS
If unsure, say N.
@@ -63,12 +63,12 @@ index d6a0b31b13dc..2420d38cbfb9 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index da8d360fb032..e1a347df77ac 100644
+index 5fe09d4e6d6a..36756b715103 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -96,6 +96,10 @@
- #include <linux/kasan.h>
+@@ -97,6 +97,10 @@
#include <linux/scs.h>
+ #include <linux/io_uring.h>
+#ifdef CONFIG_USER_NS
+#include <linux/user_namespace.h>
@@ -77,7 +77,7 @@ index da8d360fb032..e1a347df77ac 100644
#include <asm/pgalloc.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
-@@ -1841,6 +1845,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1862,6 +1866,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 da8d360fb032..e1a347df77ac 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2900,6 +2908,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2927,6 +2935,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -150,5 +150,5 @@ index 87804e0371fe..66b5afb0d0ee 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.28.0
+2.29.2