summarylogtreecommitdiffstats
path: root/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
diff options
context:
space:
mode:
authorgraysky2021-11-01 12:58:39 -0400
committergraysky2021-11-01 12:58:39 -0400
commit7b7384a7e60121f0c1bf4a8662b2497289c8a284 (patch)
tree1e29911491dfcde4057d03bc1be2e2e9f6fcb42e /0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
parentc6f7a09a0f5e4b20645457afc8a36c115e5de720 (diff)
downloadaur-7b7384a7e60121f0c1bf4a8662b2497289c8a284.tar.gz
Update to 5.14.16rc1-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 368a06fdaf34..2ae19683894d 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 f33efe28389ec4573fdc6e92c40583a395f38f46 Mon Sep 17 00:00:00 2001
+From 9560aafb74c1cd209e8acbf6a45891be37397500 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/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/7] 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 eb70cabe6e7f..dda54e3bc47c 100644
+index 33a4240e6a6f..82213f9c4c17 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
-@@ -137,6 +137,8 @@ static inline void set_rlimit_ucount_max(struct user_namespace *ns,
+@@ -139,6 +139,8 @@ static inline void set_rlimit_ucount_max(struct user_namespace *ns,
#ifdef CONFIG_USER_NS
@@ -26,7 +26,7 @@ index eb70cabe6e7f..dda54e3bc47c 100644
static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
{
if (ns)
-@@ -170,6 +172,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns);
+@@ -172,6 +174,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns);
struct ns_common *ns_get_owner(struct ns_common *ns);
#else
@@ -150,5 +150,5 @@ index ef82d401dde8..5a6c2e07174b 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.33.0
+2.33.1