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 | 19 |
1 files changed, 10 insertions, 9 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 fced98119610..41ff6902dea8 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 4272e4eff36395bf7e89550111219bede31013e2 Mon Sep 17 00:00:00 2001 +From 97ad944eef70f5d93159eaaf969e5ca9055f98f8 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/2] 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 b69248e6f0e0..3b1cd11dc6dc 100644 +index 2628f3773ca8..a2da35b446a6 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -104,6 +104,11 @@ +@@ -103,6 +103,11 @@ #define CREATE_TRACE_POINTS #include <trace/events/task.h> @@ -28,7 +29,7 @@ index b69248e6f0e0..3b1cd11dc6dc 100644 /* * Minimum number of threads to boot the kernel -@@ -1695,6 +1700,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1719,6 +1724,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 b69248e6f0e0..3b1cd11dc6dc 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2528,6 +2537,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2554,6 +2563,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -53,10 +54,10 @@ index b69248e6f0e0..3b1cd11dc6dc 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index d80bee8ff12e..ce7a1a5794a5 100644 +index c9ec050bcf46..e1f3a1eb976a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -106,6 +106,9 @@ extern int core_uses_pid; +@@ -108,6 +108,9 @@ extern int core_uses_pid; extern char core_pattern[]; extern unsigned int core_pipe_limit; #endif @@ -66,7 +67,7 @@ index d80bee8ff12e..ce7a1a5794a5 100644 extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -515,6 +518,15 @@ static struct ctl_table kern_table[] = { +@@ -535,6 +538,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif |