diff options
author | Piotr Gorski | 2018-05-23 14:08:41 +0200 |
---|---|---|
committer | Piotr Gorski | 2018-05-23 14:08:41 +0200 |
commit | 1275fcbd543d3364296fbf8211b6bab3103a66a4 (patch) | |
tree | 6a27bb15d45e6e01f4ed3041484d33868c432e61 /0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | |
parent | 4aeeb1c93bf243d74926dab51fea444fcb70e634 (diff) | |
download | aur-1275fcbd543d3364296fbf8211b6bab3103a66a4.tar.gz |
Sync with -ARCH
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
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 | 20 |
1 files changed, 10 insertions, 10 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 6748fd65e79c..724b168dc89b 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From 1d8e17daf031e219d904ef93718081534c9e8cea Mon Sep 17 00:00:00 2001 -Message-Id: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> +From 44c5097b2711429f0d49d138681f67157982e729 Mon Sep 17 00:00:00 2001 +Message-Id: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> @@ -15,10 +15,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 e5d9d405ae4e..c4be89c51f25 100644 +index 2295fc69717f..6f320a216e7d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -103,6 +103,11 @@ +@@ -102,6 +102,11 @@ #define CREATE_TRACE_POINTS #include <trace/events/task.h> @@ -30,7 +30,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 /* * Minimum number of threads to boot the kernel -@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1550,6 +1555,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -41,7 +41,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -2343,6 +2352,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -55,7 +55,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index f98f28c12020..7256d339a32a 100644 +index 557d46728577..c19d7a828913 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,6 +105,9 @@ extern int core_uses_pid; @@ -68,7 +68,7 @@ index f98f28c12020..7256d339a32a 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[] = { +@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.17.0 +2.16.1 |