summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
authorgraysky2020-10-27 10:51:01 -0400
committergraysky2020-10-27 10:51:01 -0400
commit59c99e716183ba0422753adbb8b94fc97b0f3cf5 (patch)
tree5b4b724f92352bd871e8d6a286c5710fd98d8354 /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
parent627acd74d3ad4b261edade2cbfc8f7f0440ec3a8 (diff)
downloadaur-59c99e716183ba0422753adbb8b94fc97b0f3cf5.tar.gz
Update to 5.9.2rc1-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.patch16
1 files changed, 8 insertions, 8 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 4cff96d4fc7..80364739ab9 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,4 +1,4 @@
-From 78508a927d710e4077f50f188b69ba5000b68e78 Mon Sep 17 00:00:00 2001
+From c7c51372f02b8b45275897e5728ef28a35b82658 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
@@ -36,10 +36,10 @@ index 6ef1c7109fc4..2140091b0b8d 100644
{
return &init_user_ns;
diff --git a/init/Kconfig b/init/Kconfig
-index 0498af567f70..078a0b73effd 100644
+index d6a0b31b13dc..2420d38cbfb9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1140,6 +1140,22 @@ config USER_NS
+@@ -1168,6 +1168,22 @@ config USER_NS
If unsure, say N.
@@ -63,7 +63,7 @@ index 0498af567f70..078a0b73effd 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index efc5493203ae..90859b7531d3 100644
+index da8d360fb032..e1a347df77ac 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -96,6 +96,10 @@
@@ -77,7 +77,7 @@ index efc5493203ae..90859b7531d3 100644
#include <asm/pgalloc.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
-@@ -1861,6 +1865,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1841,6 +1845,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 efc5493203ae..90859b7531d3 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2961,6 +2969,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2900,6 +2908,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -102,7 +102,7 @@ index efc5493203ae..90859b7531d3 100644
if (err)
goto bad_unshare_out;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index db1ce7af2563..9b73467e279d 100644
+index afad085960b8..a94828fb31c2 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -103,6 +103,9 @@
@@ -115,7 +115,7 @@ index db1ce7af2563..9b73467e279d 100644
#if defined(CONFIG_SYSCTL)
-@@ -1882,6 +1885,15 @@ static struct ctl_table kern_table[] = {
+@@ -1902,6 +1905,15 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
#endif