summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
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 9d894224f5e..1ba337e6432 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 2efb3d95a5e8a14c097d570a61751f36d0be5215 Mon Sep 17 00:00:00 2001
+From 29d4e22912c69936a503f521b8eff1b3d5dfd427 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/6] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/4] 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 ef59c5c36cdb..aaad1e4a5772 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1110,6 +1110,22 @@ config USER_NS
+@@ -1094,6 +1094,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 c9ba2b7bfef9..599349b67aca 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -106,6 +106,11 @@
@@ -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)
+@@ -2934,6 +2943,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;