summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
authorgraysky2023-05-10 13:28:43 -0400
committergraysky2023-05-10 13:28:43 -0400
commit5bbcb7a87fc7d037c7d524fe6a5bfd77383ff7eb (patch)
tree926f239527ecfd56206ad01465208b6e159991c9 /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
parent899d439f791a6b23040305a120d6580ca2caac30 (diff)
downloadaur-5bbcb7a87fc7d037c7d524fe6a5bfd77383ff7eb.tar.gz
Update to 6.3.1-2
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 b0fa1b3c8228..96e301fa14a9 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 3c5746e7f5d3d5dec9afdb9a71b8e63e97e4470c Mon Sep 17 00:00:00 2001
+From e2e0cdead496d7d17e0376191e3b94261632496a 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 45f09bec02c4..87b20e2ee274 100644
{
return &init_user_ns;
diff --git a/init/Kconfig b/init/Kconfig
-index 44e90b28a30f..e0fa7d9f9778 100644
+index c88bb30a8b0b..32ba96d94028 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1253,6 +1253,22 @@ config USER_NS
+@@ -1249,6 +1249,22 @@ config USER_NS
If unsure, say N.
@@ -63,7 +63,7 @@ index 44e90b28a30f..e0fa7d9f9778 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index 8dd0127ddcb8..b143c220c8b9 100644
+index ea332319dffe..349945168239 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -98,6 +98,10 @@
@@ -77,7 +77,7 @@ index 8dd0127ddcb8..b143c220c8b9 100644
#include <asm/pgalloc.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
-@@ -2030,6 +2034,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -2032,6 +2036,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 8dd0127ddcb8..b143c220c8b9 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -3180,6 +3188,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -3182,6 +3190,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -132,7 +132,7 @@ index 1c240d2c99bc..2971581a27e2 100644
{
.procname = "tainted",
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 54211dbd516c..16ca0c151629 100644
+index 1d8e47bed3f1..fec01d016a35 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -22,6 +22,13 @@
@@ -150,5 +150,5 @@ index 54211dbd516c..16ca0c151629 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.40.0
+2.40.1