summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
authorgraysky2021-08-06 05:32:12 -0400
committergraysky2021-08-06 05:32:12 -0400
commit2f63ceb675f5f33c5e0948f0cc3cf0097808c8ae (patch)
tree9cb6212ce8faa80ba769124d5da6bf01f3e69893 /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
parentc7a8a7f94ef8ac9ca94cf7dd3677842add90f4f7 (diff)
downloadaur-2f63ceb675f5f33c5e0948f0cc3cf0097808c8ae.tar.gz
Update to 5.13.9rc1-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.patch14
1 files changed, 7 insertions, 7 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 17037d74db17..1381204c86ae 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 a5b30f8875bb823de46bb8809e6a7932a567d357 Mon Sep 17 00:00:00 2001
+From 90de407f12e8ed9cb361678882c2af236b06107e 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.
@@ -14,10 +14,10 @@ Our default behavior continues to match the vanilla kernel.
5 files changed, 53 insertions(+)
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
-index 1d08dbbcfe32..180da8f71205 100644
+index bfa6463f8a95..27aa2bd5e50a 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
-@@ -112,6 +112,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type);
+@@ -116,6 +116,8 @@ void put_ucounts(struct ucounts *ucounts);
#ifdef CONFIG_USER_NS
@@ -26,7 +26,7 @@ index 1d08dbbcfe32..180da8f71205 100644
static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
{
if (ns)
-@@ -145,6 +147,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns);
+@@ -149,6 +151,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns);
struct ns_common *ns_get_owner(struct ns_common *ns);
#else
@@ -63,7 +63,7 @@ index a61c92066c2e..6a2920f2e2ad 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index a070caed5c8e..03baafd70b98 100644
+index 567fee340500..f8ad32116152 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -98,6 +98,10 @@
@@ -132,7 +132,7 @@ index d4a78e08f6d8..0260dfe2daff 100644
{
.procname = "tainted",
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 8d62863721b0..5ca391b2b506 100644
+index 27670ab7a4ed..300c72d2a381 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -21,6 +21,13 @@