summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
authorgraysky2022-06-15 20:52:20 -0400
committergraysky2022-06-15 20:52:20 -0400
commit48a238b731736c76d9416df7810159b081312b0d (patch)
tree38dfcc162de7c24289fb71e9dd57b3a341dc4620 /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
parentb0756dece3a231e6c4b4c8c8e823d7b6109c92b2 (diff)
downloadaur-48a238b731736c76d9416df7810159b081312b0d.tar.gz
Update to 5.18.4-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.patch12
1 files changed, 6 insertions, 6 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 081721495a2d..bdb5b9a519b5 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 6b212353b9dd9da3c9ff4272ca951d97fb6b10b4 Mon Sep 17 00:00:00 2001
+From 81630fb51fe95fd5d184974ed0c9074f0d9a648d 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/2] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644
{
return &init_user_ns;
diff --git a/init/Kconfig b/init/Kconfig
-index ddcbefe535e9..f05715cf89af 100644
+index b19e2eeaae80..2c2e01d76076 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1235,6 +1235,22 @@ config USER_NS
+@@ -1240,6 +1240,22 @@ config USER_NS
If unsure, say N.
@@ -63,7 +63,7 @@ index ddcbefe535e9..f05715cf89af 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index 35a3beff140b..b013ab5ee88f 100644
+index 0d8abfb9e0f4..bd7c215e315f 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -99,6 +99,10 @@
@@ -88,7 +88,7 @@ index 35a3beff140b..b013ab5ee88f 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -3110,6 +3118,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -3128,6 +3136,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;