diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 2 | ||||
| -rw-r--r-- | 0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch | 2 | ||||
| -rw-r--r-- | 0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch | 2 | ||||
| -rw-r--r-- | 0004-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch | 116 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
6 files changed, 32 insertions, 124 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.7.9 + pkgver = 5.7.10 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -8,8 +8,8 @@ pkgbase = linux-ck makedepends = kmod makedepends = libelf options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.9.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.9.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.10.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.10.tar.sign source = config source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz source = http://ck.kolivas.org/patches/5.0/5.7/5.7-ck1/patch-5.7-ck1.xz @@ -22,7 +22,7 @@ pkgbase = linux-ck source = 0004-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = a87d3066a7849cd6ba9a004311a9ee0402d29d17f12f64ad7d942447070b43f8 + sha256sums = 4725430c65b7573b7d26c402dd9ffdad18529a302ce2e342c849e7800f193d44 sha256sums = SKIP sha256sums = ed60b20ee841e16038da0d145fbf3f53fac94122c4001d6cd03abe64e9e760f6 sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90 @@ -30,10 +30,10 @@ pkgbase = linux-ck sha256sums = 5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328 sha256sums = 961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558 sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c - sha256sums = e94914b0fe6bfeb4cb664aaa6297b86c221080bf85a73a3966555bac79aaca78 - sha256sums = 85d925e28e3aaa34cbd3504dddd9e79b6ac103637a4719d1c305d68bf11a624b - sha256sums = 436adb183f5c2b990fae1c966a73c2691553e0dff01d5d9886d91eb885fa393f - sha256sums = eb66e9d5f2ec2b6d65c39316d95d2a1854ec4c6815ae4789d84afcd20800cf79 + sha256sums = f8f16c971882312c91618e4305b63f7aa2265af12208a902f87b6d3c1b1cf6ee + sha256sums = a0bd98f1056d06126532350a55f633c92a43e3adb94d96c94f4d22f54e4d9807 + sha256sums = 4c5b15c39e7d8f7b8c0fbee16bcc3992cecf38bb790df494b411a57366e3b677 + sha256sums = 18f22c5c095049cf3eebe4ec2c63e659dd35af6e49d2092865643d6ae2f7c411 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler @@ -42,11 +42,11 @@ pkgname = linux-ck depends = initramfs optdepends = crda: to set the correct wireless channels of your country optdepends = linux-firmware: firmware images needed for some devices - provides = linux-ck=5.7.9 + provides = linux-ck=5.7.10 pkgname = linux-ck-headers pkgdesc = Headers and scripts for building modules for Linux-ck kernel depends = linux-ck - provides = linux-ck-headers=5.7.9 - provides = linux-headers=5.7.9 + provides = linux-ck-headers=5.7.10 + provides = linux-headers=5.7.10 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 4a3bdc6f3232..a40d2c23b3c4 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,4 +1,4 @@ -From f7dd45a3ae86afe15f64746d621d786f13860a65 Mon Sep 17 00:00:00 2001 +From c701fa45808d40c6ce027c31c3e318bb678cb5b3 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/5] ZEN: Add sysctl and CONFIG to disallow unprivileged diff --git a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch b/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch index 5e2c5ecfa16f..741e8e7cfeb5 100644 --- a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch +++ b/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch @@ -1,4 +1,4 @@ -From ece7e249df5e71be440baaf25b324a62e0a715fa Mon Sep 17 00:00:00 2001 +From 18693ce191f146cea8dd6299f40e3db3a9367e82 Mon Sep 17 00:00:00 2001 From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Date: Wed, 15 Apr 2020 17:38:32 -0700 Subject: [PATCH 2/5] PCI/EDR: Log only ACPI_NOTIFY_DISCONNECT_RECOVER events diff --git a/0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch b/0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch index a2a44b320d84..40e22d840095 100644 --- a/0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch +++ b/0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch @@ -1,4 +1,4 @@ -From b2fd0d69f3b155b0c575dd540ad354e4b5323034 Mon Sep 17 00:00:00 2001 +From 3639fafc8d7ebd9bdb0365c54fdb57745c47f264 Mon Sep 17 00:00:00 2001 From: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it> Date: Thu, 2 Jul 2020 17:05:52 +0200 Subject: [PATCH 3/5] iwlwifi: Make some Killer Wireless-AC 1550 cards working diff --git a/0004-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch b/0004-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch index 6138f57ef8c3..9d1b0d24f526 100644 --- a/0004-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch +++ b/0004-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch @@ -1,4 +1,4 @@ -From 0fe1b29d2826794bfd880944496b433c80da0173 Mon Sep 17 00:00:00 2001 +From d14a96d0a5e05d99c5fe083c49d33197c215dbe1 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> Date: Wed, 15 Jul 2020 22:42:07 +0200 Subject: [PATCH 4/5] virt: vbox: Add support for the new @@ -135,18 +135,16 @@ Date: Thu Jul 9 14:08:51 2020 +0200 Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- - drivers/virt/vboxguest/vboxguest_core.c | 272 +++++++++++++++++++---- - drivers/virt/vboxguest/vboxguest_core.h | 38 +++- - drivers/virt/vboxguest/vboxguest_linux.c | 3 +- + drivers/virt/vboxguest/vboxguest_core.c | 266 +++++++++++++++++++---- + drivers/virt/vboxguest/vboxguest_core.h | 23 +- drivers/virt/vboxguest/vboxguest_utils.c | 1 + - drivers/virt/vboxguest/vmmdev.h | 2 + include/linux/vbox_utils.h | 1 + include/uapi/linux/vbox_vmmdev_types.h | 3 + - include/uapi/linux/vboxguest.h | 28 ++- - 8 files changed, 294 insertions(+), 54 deletions(-) + include/uapi/linux/vboxguest.h | 24 ++ + 6 files changed, 269 insertions(+), 49 deletions(-) diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c -index b690a8a4bf9e..0b43efddea22 100644 +index 18ebd7a6af98..0b43efddea22 100644 --- a/drivers/virt/vboxguest/vboxguest_core.c +++ b/drivers/virt/vboxguest/vboxguest_core.c @@ -559,7 +559,7 @@ static int vbg_reset_host_event_filter(struct vbg_dev *gdev, @@ -488,15 +486,6 @@ index b690a8a4bf9e..0b43efddea22 100644 static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev, struct vbg_session *session, struct vbg_ioctl_set_guest_caps *caps) { -@@ -1444,7 +1618,7 @@ static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev, - or_mask = caps->u.in.or_mask; - not_mask = caps->u.in.not_mask; - -- if ((or_mask | not_mask) & ~VMMDEV_EVENT_VALID_EVENT_MASK) -+ if ((or_mask | not_mask) & ~VMMDEV_GUEST_CAPABILITIES_MASK) - return -EINVAL; - - ret = vbg_set_session_capabilities(gdev, session, or_mask, not_mask, @@ -1452,7 +1626,7 @@ static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev, if (ret) return ret; @@ -506,17 +495,7 @@ index b690a8a4bf9e..0b43efddea22 100644 caps->u.out.global_caps = gdev->guest_caps_host; return 0; -@@ -1520,7 +1694,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) - - /* For VMMDEV_REQUEST hdr->type != VBG_IOCTL_HDR_TYPE_DEFAULT */ - if (req_no_size == VBG_IOCTL_VMMDEV_REQUEST(0) || -- req == VBG_IOCTL_VMMDEV_REQUEST_BIG) -+ req == VBG_IOCTL_VMMDEV_REQUEST_BIG || -+ req == VBG_IOCTL_VMMDEV_REQUEST_BIG_ALT) - return vbg_ioctl_vmmrequest(gdev, session, data); - - if (hdr->type != VBG_IOCTL_HDR_TYPE_DEFAULT) -@@ -1540,6 +1715,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) +@@ -1541,6 +1715,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) return vbg_ioctl_interrupt_all_wait_events(gdev, session, data); case VBG_IOCTL_CHANGE_FILTER_MASK: return vbg_ioctl_change_filter_mask(gdev, session, data); @@ -525,11 +504,7 @@ index b690a8a4bf9e..0b43efddea22 100644 case VBG_IOCTL_CHANGE_GUEST_CAPABILITIES: return vbg_ioctl_change_guest_capabilities(gdev, session, data); case VBG_IOCTL_CHECK_BALLOON: -@@ -1558,10 +1735,11 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) - case VBG_IOCTL_HGCM_CALL(0): - return vbg_ioctl_hgcm_call(gdev, session, f32bit, data); - case VBG_IOCTL_LOG(0): -+ case VBG_IOCTL_LOG_ALT(0): +@@ -1563,7 +1739,7 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) return vbg_ioctl_log(data); } @@ -539,32 +514,10 @@ index b690a8a4bf9e..0b43efddea22 100644 } diff --git a/drivers/virt/vboxguest/vboxguest_core.h b/drivers/virt/vboxguest/vboxguest_core.h -index 4188c12b839f..ab4bf64e2cec 100644 +index 77c3a9c8255d..ab4bf64e2cec 100644 --- a/drivers/virt/vboxguest/vboxguest_core.h +++ b/drivers/virt/vboxguest/vboxguest_core.h -@@ -15,6 +15,21 @@ - #include <linux/vboxguest.h> - #include "vmmdev.h" - -+/* -+ * The mainline kernel version (this version) of the vboxguest module -+ * contained a bug where it defined VBGL_IOCTL_VMMDEV_REQUEST_BIG and -+ * VBGL_IOCTL_LOG using _IOC(_IOC_READ | _IOC_WRITE, 'V', ...) instead -+ * of _IO(V, ...) as the out of tree VirtualBox upstream version does. -+ * -+ * These _ALT definitions keep compatibility with the wrong defines the -+ * mainline kernel version used for a while. -+ * Note the VirtualBox userspace bits have always been built against -+ * VirtualBox upstream's headers, so this is likely not necessary. But -+ * we must never break our ABI so we keep these around to be 100% sure. -+ */ -+#define VBG_IOCTL_VMMDEV_REQUEST_BIG_ALT _IOC(_IOC_READ | _IOC_WRITE, 'V', 3, 0) -+#define VBG_IOCTL_LOG_ALT(s) _IOC(_IOC_READ | _IOC_WRITE, 'V', 9, s) -+ - struct vbg_session; - - /** VBox guest memory balloon. */ -@@ -103,11 +118,21 @@ struct vbg_dev { +@@ -118,11 +118,21 @@ struct vbg_dev { u32 event_filter_host; /** @@ -588,7 +541,7 @@ index 4188c12b839f..ab4bf64e2cec 100644 /** * The guest capabilities last reported to the host (or UINT32_MAX). * Protected by session_mutex. -@@ -149,11 +174,16 @@ struct vbg_session { +@@ -164,11 +174,16 @@ struct vbg_session { */ u32 event_filter; /** @@ -607,20 +560,6 @@ index 4188c12b839f..ab4bf64e2cec 100644 /** VMMDEV_REQUESTOR_* flags */ u32 requestor; /** Set on CANCEL_ALL_WAITEVENTS, protected by vbg_devevent_spinlock. */ -diff --git a/drivers/virt/vboxguest/vboxguest_linux.c b/drivers/virt/vboxguest/vboxguest_linux.c -index 6e8c0f1c1056..32c2c52f7e84 100644 ---- a/drivers/virt/vboxguest/vboxguest_linux.c -+++ b/drivers/virt/vboxguest/vboxguest_linux.c -@@ -131,7 +131,8 @@ static long vbg_misc_device_ioctl(struct file *filp, unsigned int req, - * the need for a bounce-buffer and another copy later on. - */ - is_vmmdev_req = (req & ~IOCSIZE_MASK) == VBG_IOCTL_VMMDEV_REQUEST(0) || -- req == VBG_IOCTL_VMMDEV_REQUEST_BIG; -+ req == VBG_IOCTL_VMMDEV_REQUEST_BIG || -+ req == VBG_IOCTL_VMMDEV_REQUEST_BIG_ALT; - - if (is_vmmdev_req) - buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT, diff --git a/drivers/virt/vboxguest/vboxguest_utils.c b/drivers/virt/vboxguest/vboxguest_utils.c index 7396187ee32a..ea05af41ec69 100644 --- a/drivers/virt/vboxguest/vboxguest_utils.c @@ -633,19 +572,6 @@ index 7396187ee32a..ea05af41ec69 100644 #if defined(DEBUG) && !defined(CONFIG_DYNAMIC_DEBUG) VBG_LOG(vbg_debug, pr_debug); #endif -diff --git a/drivers/virt/vboxguest/vmmdev.h b/drivers/virt/vboxguest/vmmdev.h -index 6337b8d75d96..21f408120e3f 100644 ---- a/drivers/virt/vboxguest/vmmdev.h -+++ b/drivers/virt/vboxguest/vmmdev.h -@@ -206,6 +206,8 @@ VMMDEV_ASSERT_SIZE(vmmdev_mask, 24 + 8); - * not. - */ - #define VMMDEV_GUEST_SUPPORTS_GRAPHICS BIT(2) -+/* The mask of valid capabilities, for sanity checking. */ -+#define VMMDEV_GUEST_CAPABILITIES_MASK 0x00000007U - - /** struct vmmdev_hypervisorinfo - Hypervisor info structure. */ - struct vmmdev_hypervisorinfo { diff --git a/include/linux/vbox_utils.h b/include/linux/vbox_utils.h index ff56c443180c..db8a7d118093 100644 --- a/include/linux/vbox_utils.h @@ -680,27 +606,9 @@ index c27289fd619a..f8a8d6b3c521 100644 VMMDEVREQ_SIZEHACK = 0x7fffffff }; diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h -index 9cec58a6a5ea..15125f6ec60d 100644 +index f79d7abe27db..15125f6ec60d 100644 --- a/include/uapi/linux/vboxguest.h +++ b/include/uapi/linux/vboxguest.h -@@ -103,7 +103,7 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_driver_version_info, 24 + 20); - - - /* IOCTL to perform a VMM Device request larger then 1KB. */ --#define VBG_IOCTL_VMMDEV_REQUEST_BIG _IOC(_IOC_READ | _IOC_WRITE, 'V', 3, 0) -+#define VBG_IOCTL_VMMDEV_REQUEST_BIG _IO('V', 3) - - - /** VBG_IOCTL_HGCM_CONNECT data structure. */ -@@ -198,7 +198,7 @@ struct vbg_ioctl_log { - } u; - }; - --#define VBG_IOCTL_LOG(s) _IOC(_IOC_READ | _IOC_WRITE, 'V', 9, s) -+#define VBG_IOCTL_LOG(s) _IO('V', 9) - - - /** VBG_IOCTL_WAIT_FOR_EVENTS data structure. */ @@ -257,6 +257,30 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_change_filter, 24 + 8); _IOWR('V', 12, struct vbg_ioctl_change_filter) @@ -64,7 +64,7 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.7.9 +pkgver=5.7.10 pkgrel=1 _ckpatchversion=1 arch=(x86_64) @@ -93,7 +93,7 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('a87d3066a7849cd6ba9a004311a9ee0402d29d17f12f64ad7d942447070b43f8' +sha256sums=('4725430c65b7573b7d26c402dd9ffdad18529a302ce2e342c849e7800f193d44' 'SKIP' 'ed60b20ee841e16038da0d145fbf3f53fac94122c4001d6cd03abe64e9e760f6' '278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90' @@ -101,10 +101,10 @@ sha256sums=('a87d3066a7849cd6ba9a004311a9ee0402d29d17f12f64ad7d942447070b43f8' '5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328' '961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558' '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c' - 'e94914b0fe6bfeb4cb664aaa6297b86c221080bf85a73a3966555bac79aaca78' - '85d925e28e3aaa34cbd3504dddd9e79b6ac103637a4719d1c305d68bf11a624b' - '436adb183f5c2b990fae1c966a73c2691553e0dff01d5d9886d91eb885fa393f' - 'eb66e9d5f2ec2b6d65c39316d95d2a1854ec4c6815ae4789d84afcd20800cf79') + 'f8f16c971882312c91618e4305b63f7aa2265af12208a902f87b6d3c1b1cf6ee' + 'a0bd98f1056d06126532350a55f633c92a43e3adb94d96c94f4d22f54e4d9807' + '4c5b15c39e7d8f7b8c0fbee16bcc3992cecf38bb790df494b411a57366e3b677' + '18f22c5c095049cf3eebe4ec2c63e659dd35af6e49d2092865643d6ae2f7c411') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |