diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
3 files changed, 25 insertions, 25 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-rc - pkgver = 6.9rc1 + pkgver = 6.10rc1 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -32,12 +32,12 @@ pkgbase = linux-rc makedepends = git options = !debug options = !strip - source = https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.9-rc1.tar.gz - source = https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/abef9db380deca88617f7014b683667ef6fc81e4/config + source = https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.10-rc1.tar.gz + source = https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/1e29f0ecf2221b2fbf580752f42ab5040d88b5e0/config source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - sha256sums = a0239424e10e45c43252d5decc6978a3fa58e0d4d631d0855db57fa209f53165 - sha256sums = c2b00c84c4b543db431e06604d939a62f93107d18369f4d9860dc8062b01ab45 - sha256sums = 416609986399d3046811bcc2344f4ee0833b6c92e305da3925a6e193f810dad2 + sha256sums = 102823885970d7d7bcf05a9b55dbe851ef95d99ba4b2d779e3e6343bdd4b6ecc + sha256sums = 5f8a4de3f17d6d1b624e70514327b05fafffe8af913f95829b9c6830b4a8a4e3 + sha256sums = e3ff7450ac5ce41729febf471cba26446f88c3e711808cb01a012ed4d9f8d345 pkgname = linux-rc pkgdesc = The Linux kernel and modules - Release Candidate version diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index d00d967d7c92..a4630f6898c5 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 9d3a77d68441f82ae970418e45de3d3db14daabc Mon Sep 17 00:00:00 2001 +From 9d9743a00d2244e8e86f51583516a86f40f36c62 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/4] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -36,7 +36,7 @@ index 6030a8235..60b7fe5fa 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index bee58f746..859989666 100644 +index 664bedb9a..746e382ad 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1247,6 +1247,22 @@ config USER_NS @@ -63,12 +63,12 @@ index bee58f746..859989666 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 0d944e92a..5449c990a 100644 +index aebb3e6c9..f186c7298 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -102,6 +102,10 @@ - #include <linux/iommu.h> - #include <linux/rseq.h> +@@ -104,6 +104,10 @@ + #include <uapi/linux/pidfd.h> + #include <linux/pidfs.h> +#ifdef CONFIG_USER_NS +#include <linux/user_namespace.h> @@ -77,7 +77,7 @@ index 0d944e92a..5449c990a 100644 #include <asm/pgalloc.h> #include <linux/uaccess.h> #include <asm/mmu_context.h> -@@ -2260,6 +2264,10 @@ __latent_entropy struct task_struct *copy_process( +@@ -2154,6 +2158,10 @@ __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 0d944e92a..5449c990a 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3406,6 +3414,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3301,6 +3309,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,7 +102,7 @@ index 0d944e92a..5449c990a 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 157f7ce29..881fc4f5d 100644 +index 81cc97491..db581894e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -80,6 +80,9 @@ @@ -132,7 +132,7 @@ index 157f7ce29..881fc4f5d 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index ce4d99df5..8272e2e35 100644 +index 0b0b95418..c4b835b91 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -22,6 +22,13 @@ @@ -150,5 +150,5 @@ index ce4d99df5..8272e2e35 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.44.0 +2.45.1 @@ -35,10 +35,10 @@ fi ################################################################################### pkgbase=linux-rc -pkgver=6.9rc1 -_pkgver=6.9-rc1 +pkgver=6.10rc1 +_pkgver=6.10-rc1 pkgrel=1 -commit=abef9db380deca88617f7014b683667ef6fc81e4 +commit=1e29f0ecf2221b2fbf580752f42ab5040d88b5e0 arch=(x86_64) url='https://www.kernel.org/' license=(GPL-2.0-only) @@ -285,7 +285,7 @@ _package-headers(){ # https://bugs.archlinux.org/task/71392 install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h - msg "Installing KConfig files..." + msg "Installing Kconfig files..." find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \; msg "Removing unneeded architectures..." @@ -328,9 +328,9 @@ _package-headers(){ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" } -sha256sums=('a0239424e10e45c43252d5decc6978a3fa58e0d4d631d0855db57fa209f53165' - 'c2b00c84c4b543db431e06604d939a62f93107d18369f4d9860dc8062b01ab45' - '416609986399d3046811bcc2344f4ee0833b6c92e305da3925a6e193f810dad2') +sha256sums=('102823885970d7d7bcf05a9b55dbe851ef95d99ba4b2d779e3e6343bdd4b6ecc' + '5f8a4de3f17d6d1b624e70514327b05fafffe8af913f95829b9c6830b4a8a4e3' + 'e3ff7450ac5ce41729febf471cba26446f88c3e711808cb01a012ed4d9f8d345') pkgname=($pkgbase $pkgbase-headers) for _p in "${pkgname[@]}"; do |