This repository has been archived on 2024-05-26. You can view files and clone it, but cannot push or open issues or pull requests.
server-kernel/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch

155 lines
4.4 KiB
Diff
Raw Normal View History

2021-05-05 14:25:49 +02:00
From 1ed48c405ba85328bae25d2f393700ba715a2f81 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
2021-05-05 14:25:49 +02:00
Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
---
2020-09-11 00:30:35 +02:00
include/linux/user_namespace.h | 4 ++++
init/Kconfig | 16 ++++++++++++++++
kernel/fork.c | 14 ++++++++++++++
kernel/sysctl.c | 12 ++++++++++++
kernel/user_namespace.c | 7 +++++++
5 files changed, 53 insertions(+)
2020-09-11 00:30:35 +02:00
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
2021-05-05 14:25:49 +02:00
index f6c5f784be5a..07d194f23587 100644
2020-09-11 00:30:35 +02:00
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
2021-05-05 14:25:49 +02:00
@@ -108,6 +108,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type);
2020-09-11 00:30:35 +02:00
#ifdef CONFIG_USER_NS
+extern int unprivileged_userns_clone;
+
static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
{
if (ns)
2021-05-05 14:25:49 +02:00
@@ -141,6 +143,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns);
2020-09-11 00:30:35 +02:00
struct ns_common *ns_get_owner(struct ns_common *ns);
#else
+#define unprivileged_userns_clone 0
+
static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
{
return &init_user_ns;
diff --git a/init/Kconfig b/init/Kconfig
2021-05-05 14:25:49 +02:00
index 5f5c776ef192..afd708ed0241 100644
--- a/init/Kconfig
+++ b/init/Kconfig
2021-05-05 14:25:49 +02:00
@@ -1177,6 +1177,22 @@ config USER_NS
If unsure, say N.
+config USER_NS_UNPRIVILEGED
+ bool "Allow unprivileged users to create namespaces"
+ default y
+ depends on USER_NS
+ help
+ When disabled, unprivileged users will not be able to create
+ new namespaces. Allowing users to create their own namespaces
+ has been part of several recent local privilege escalation
+ exploits, so if you need user namespaces but are
+ paranoid^Wsecurity-conscious you want to disable this.
+
+ This setting can be overridden at runtime via the
+ kernel.unprivileged_userns_clone sysctl.
+
+ If unsure, say Y.
+
config PID_NS
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
2021-05-05 14:25:49 +02:00
index 426cd0c51f9e..e83a79860d58 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
2021-05-05 14:25:49 +02:00
@@ -97,6 +97,10 @@
2020-09-11 00:30:35 +02:00
#include <linux/scs.h>
2021-05-05 14:25:49 +02:00
#include <linux/io_uring.h>
+#ifdef CONFIG_USER_NS
2020-09-11 00:30:35 +02:00
+#include <linux/user_namespace.h>
+#endif
2020-09-11 00:30:35 +02:00
+
#include <asm/pgalloc.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
2021-05-05 14:25:49 +02:00
@@ -1872,6 +1876,10 @@ static __latent_entropy struct task_struct *copy_process(
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
return ERR_PTR(-EINVAL);
+ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
+ if (!capable(CAP_SYS_ADMIN))
+ return ERR_PTR(-EPERM);
+
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
2021-05-05 14:25:49 +02:00
@@ -2971,6 +2979,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
+ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
+ err = -EPERM;
+ if (!capable(CAP_SYS_ADMIN))
+ goto bad_unshare_out;
+ }
+
err = check_unshare_flags(unshare_flags);
if (err)
goto bad_unshare_out;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
2021-05-05 14:25:49 +02:00
index 62fbd09b5dc1..01192edd25f3 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
2020-09-11 00:30:35 +02:00
@@ -103,6 +103,9 @@
#ifdef CONFIG_LOCKUP_DETECTOR
#include <linux/nmi.h>
#endif
+#ifdef CONFIG_USER_NS
2020-09-11 00:30:35 +02:00
+#include <linux/user_namespace.h>
+#endif
2020-09-11 00:30:35 +02:00
#if defined(CONFIG_SYSCTL)
2021-05-05 14:25:49 +02:00
@@ -1902,6 +1905,15 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
#endif
+#ifdef CONFIG_USER_NS
+ {
+ .procname = "unprivileged_userns_clone",
+ .data = &unprivileged_userns_clone,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
+#endif
#ifdef CONFIG_PROC_SYSCTL
{
.procname = "tainted",
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
2021-05-05 14:25:49 +02:00
index 9a4b980d695b..4388ca13ea3f 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -21,6 +21,13 @@
#include <linux/bsearch.h>
#include <linux/sort.h>
+/* sysctl */
+#ifdef CONFIG_USER_NS_UNPRIVILEGED
+int unprivileged_userns_clone = 1;
+#else
+int unprivileged_userns_clone;
+#endif
+
static struct kmem_cache *user_ns_cachep __read_mostly;
static DEFINE_MUTEX(userns_state_mutex);
--
2021-05-05 14:25:49 +02:00
2.31.1