From 9754fd489449d9df05eeeecf6bff7bcd720a4b86 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 12 Oct 2021 21:31:44 -0400 Subject: updpkg: libre/linux-libre-pae 5.14.11-1 Signed-off-by: David P --- ...ctl-and-CONFIG-to-disallow-unprivileged-C.patch | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch') diff --git a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index c5e5b0567..46cfcfa66 100644 --- a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 90de407f12e8ed9cb361678882c2af236b06107e Mon Sep 17 00:00:00 2001 +From f76db6fc04fadf872a138740592b4e8ec9ba9149 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/6] 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 bfa6463f8a95..27aa2bd5e50a 100644 +index eb70cabe6e7f..dda54e3bc47c 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h -@@ -116,6 +116,8 @@ void put_ucounts(struct ucounts *ucounts); +@@ -137,6 +137,8 @@ static inline void set_rlimit_ucount_max(struct user_namespace *ns, #ifdef CONFIG_USER_NS @@ -26,7 +26,7 @@ index bfa6463f8a95..27aa2bd5e50a 100644 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) { if (ns) -@@ -149,6 +151,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); +@@ -170,6 +172,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 bfa6463f8a95..27aa2bd5e50a 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index a61c92066c2e..6a2920f2e2ad 100644 +index 55f9f7738ebb..33c6a820ac08 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1195,6 +1195,22 @@ config USER_NS +@@ -1198,6 +1198,22 @@ config USER_NS If unsure, say N. @@ -63,7 +63,7 @@ index a61c92066c2e..6a2920f2e2ad 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 567fee340500..f8ad32116152 100644 +index cbba21e3a58d..7267d46c29ea 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -98,6 +98,10 @@ @@ -77,7 +77,7 @@ index 567fee340500..f8ad32116152 100644 #include #include #include -@@ -1871,6 +1875,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1877,6 +1881,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 567fee340500..f8ad32116152 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2973,6 +2981,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2981,6 +2989,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,10 +102,10 @@ index 567fee340500..f8ad32116152 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index d4a78e08f6d8..0260dfe2daff 100644 +index 272f4a272f8c..760e8a2d815d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -103,6 +103,9 @@ +@@ -105,6 +105,9 @@ #ifdef CONFIG_LOCKUP_DETECTOR #include #endif @@ -115,7 +115,7 @@ index d4a78e08f6d8..0260dfe2daff 100644 #if defined(CONFIG_SYSCTL) -@@ -1896,6 +1899,15 @@ static struct ctl_table kern_table[] = { +@@ -1908,6 +1911,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -132,7 +132,7 @@ index d4a78e08f6d8..0260dfe2daff 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 27670ab7a4ed..300c72d2a381 100644 +index ef82d401dde8..5a6c2e07174b 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -21,6 +21,13 @@ @@ -150,5 +150,5 @@ index 27670ab7a4ed..300c72d2a381 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.32.0 +2.33.0 -- cgit v1.2.3