summarylogtreecommitdiffstats
path: root/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
diff options
context:
space:
mode:
authorDaniel Bermond2019-01-04 20:28:04 +0000
committerDaniel Bermond2019-01-04 20:28:04 +0000
commit5de0e125df1a326b9a340aa4bc267da58c4e27a1 (patch)
tree8704c22b2417a4ba2faf40e5840241e4ac2798d8 /0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
parent3133e1c59cfd248c8bf27d4af55102c2d6e14007 (diff)
downloadaur-5de0e125df1a326b9a340aa4bc267da58c4e27a1.tar.gz
Updated to version 4.19.2
Diffstat (limited to '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch')
-rw-r--r--0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index e57df3b15ce6..22e12e4b0491 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,4 +1,4 @@
-From 1a47eb71988a919e811ce558f6f58855155c6218 Mon Sep 17 00:00:00 2001
+From 1ce3e84fdf0b56f477d30acdc8797dedd7330e37 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 8ed48ca2cc43..e02823819ab7 100644
+index f0b58479534f..8b2d927125c5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -103,6 +103,11 @@
@@ -28,7 +28,7 @@ index 8ed48ca2cc43..e02823819ab7 100644
/*
* Minimum number of threads to boot the kernel
-@@ -1625,6 +1630,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1649,6 +1654,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 8ed48ca2cc43..e02823819ab7 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2421,6 +2430,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2467,6 +2476,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -53,7 +53,7 @@ index 8ed48ca2cc43..e02823819ab7 100644
if (err)
goto bad_unshare_out;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 2d9837c0aff4..eb5236c069fc 100644
+index cc02050fd0c4..ce2ad2b92897 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -105,6 +105,9 @@ extern int core_uses_pid;
@@ -66,7 +66,7 @@ index 2d9837c0aff4..eb5236c069fc 100644
extern int pid_max;
extern int pid_max_min, pid_max_max;
extern int percpu_pagelist_fraction;
-@@ -519,6 +522,15 @@ static struct ctl_table kern_table[] = {
+@@ -514,6 +517,15 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
#endif
@@ -83,7 +83,7 @@ index 2d9837c0aff4..eb5236c069fc 100644
{
.procname = "tainted",
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index e5222b5fb4fe..c941a66e51d1 100644
+index 923414a246e9..6b9dbc257e34 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -26,6 +26,9 @@
@@ -97,5 +97,5 @@ index e5222b5fb4fe..c941a66e51d1 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.19.0
+2.19.1