diff options
Diffstat (limited to 'libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch')
| -rw-r--r-- | libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 5bc4093d6..174fa18a9 100644 --- a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 2aef6c5fe88b92e9f611ec0b04ab8e023e943cd8 Mon Sep 17 00:00:00 2001 +From 22e3612b3c9305e1010da29ee500a6ad0cc3843f Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -14,10 +14,10 @@ Our default behavior continues to match the vanilla kernel. 5 files changed, 53 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 64cf8ebdc4ec..bd29529ac188 100644 +index f6c5f784be5a..07d194f23587 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h -@@ -105,6 +105,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type); +@@ -108,6 +108,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type); #ifdef CONFIG_USER_NS @@ -26,7 +26,7 @@ index 64cf8ebdc4ec..bd29529ac188 100644 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) { if (ns) -@@ -138,6 +140,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); +@@ -141,6 +143,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); struct ns_common *ns_get_owner(struct ns_common *ns); #else @@ -36,10 +36,10 @@ index 64cf8ebdc4ec..bd29529ac188 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index 29ad68325028..96b79cfb2845 100644 +index 5f5c776ef192..afd708ed0241 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1172,6 +1172,22 @@ config USER_NS +@@ -1177,6 +1177,22 @@ config USER_NS If unsure, say N. @@ -63,7 +63,7 @@ index 29ad68325028..96b79cfb2845 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index d66cd1014211..231a94ffd302 100644 +index 426cd0c51f9e..e83a79860d58 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -97,6 +97,10 @@ @@ -77,7 +77,7 @@ index d66cd1014211..231a94ffd302 100644 #include <asm/pgalloc.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> -@@ -1864,6 +1868,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1872,6 +1876,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -88,7 +88,7 @@ index d66cd1014211..231a94ffd302 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2933,6 +2941,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2971,6 +2979,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,7 +102,7 @@ index d66cd1014211..231a94ffd302 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index c9fbdd848138..1fbf5d551fa0 100644 +index 62fbd09b5dc1..01192edd25f3 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -103,6 +103,9 @@ @@ -132,7 +132,7 @@ index c9fbdd848138..1fbf5d551fa0 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index af612945a4d0..95c54dae4aa1 100644 +index 9a4b980d695b..4388ca13ea3f 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -21,6 +21,13 @@ @@ -150,5 +150,5 @@ index af612945a4d0..95c54dae4aa1 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.30.1 +2.31.1 |