diff options
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.patch | 25 |
1 files changed, 13 insertions, 12 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 a290583c2eba..8b6c3f24ffb1 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,7 +1,8 @@ -From ec4b54ebab3f84210e4b36d1af2dea754b8eb789 Mon Sep 17 00:00:00 2001 +From 3709f2a5ba6d5b36f63fcb1d348701b4c155463f 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 +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by + default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> [bwh: Remove unneeded binary sysctl bits] @@ -13,10 +14,10 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com> 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index 2628f3773ca8..a2da35b446a6 100644 +index fe83343da24b..1047576e45ef 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -103,6 +103,11 @@ +@@ -106,6 +106,11 @@ #define CREATE_TRACE_POINTS #include <trace/events/task.h> @@ -28,7 +29,7 @@ index 2628f3773ca8..a2da35b446a6 100644 /* * Minimum number of threads to boot the kernel -@@ -1719,6 +1724,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1765,6 +1770,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 +40,7 @@ index 2628f3773ca8..a2da35b446a6 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2554,6 +2563,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2653,6 +2662,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -53,10 +54,10 @@ index 2628f3773ca8..a2da35b446a6 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index c9ec050bcf46..e1f3a1eb976a 100644 +index 1beca96fb625..fb9633b8b385 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -108,6 +108,9 @@ extern int core_uses_pid; +@@ -110,6 +110,9 @@ extern int core_uses_pid; extern char core_pattern[]; extern unsigned int core_pipe_limit; #endif @@ -66,7 +67,7 @@ index c9ec050bcf46..e1f3a1eb976a 100644 extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -535,6 +538,15 @@ static struct ctl_table kern_table[] = { +@@ -532,6 +535,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -83,10 +84,10 @@ index c9ec050bcf46..e1f3a1eb976a 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 923414a246e9..6b9dbc257e34 100644 +index 0eff45ce7703..b2f8b5777670 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c -@@ -26,6 +26,9 @@ +@@ -21,6 +21,9 @@ #include <linux/bsearch.h> #include <linux/sort.h> @@ -97,5 +98,5 @@ index 923414a246e9..6b9dbc257e34 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.21.0 +2.22.0 |