summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch')
-rw-r--r--kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 1acba9de4..fced98119 100644
--- a/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,4 +1,4 @@
-From c0e9080c8b76a81fb0f5d2cbd920a24b7f17d11e Mon Sep 17 00:00:00 2001
+From 4272e4eff36395bf7e89550111219bede31013e2 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Fri, 31 May 2013 19:12:12 +0100
Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default
@@ -13,7 +13,7 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com>
3 files changed, 30 insertions(+)
diff --git a/kernel/fork.c b/kernel/fork.c
-index e2a5156bc9c3..74d59b69d494 100644
+index b69248e6f0e0..3b1cd11dc6dc 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -104,6 +104,11 @@
@@ -28,7 +28,7 @@ index e2a5156bc9c3..74d59b69d494 100644
/*
* Minimum number of threads to boot the kernel
-@@ -1698,6 +1703,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1695,6 +1700,10 @@ static __latent_entropy struct task_struct *copy_process(
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
return ERR_PTR(-EINVAL);
@@ -39,7 +39,7 @@ index e2a5156bc9c3..74d59b69d494 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2522,6 +2531,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2528,6 +2537,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -53,7 +53,7 @@ index e2a5156bc9c3..74d59b69d494 100644
if (err)
goto bad_unshare_out;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 5fc724e4e454..bea075b4bb48 100644
+index d80bee8ff12e..ce7a1a5794a5 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -106,6 +106,9 @@ extern int core_uses_pid;
@@ -97,5 +97,5 @@ index 923414a246e9..6b9dbc257e34 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.20.1
+2.21.0