From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4457158041 for ; Sat, 24 Feb 2024 09:02:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1218BE29D4; Sat, 24 Feb 2024 09:02:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E48B1E29D4 for ; Sat, 24 Feb 2024 09:02:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D29183408DD for ; Sat, 24 Feb 2024 09:02:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38757137F for ; Sat, 24 Feb 2024 09:02:10 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1708765315.b8d6d2d875d4d1b5a46ef66c7524e197d1f73623.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/, app-emulation/virtualbox-modules/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch app-emulation/virtualbox-modules/virtualbox-modules-6.1.48-r1.ebuild app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r1.ebuild app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild app-emulation/virtualbox-modules/virtualbox-modules-7.0.12-r1.ebuild app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild X-VCS-Directories: app-emulation/virtualbox-modules/ app-emulation/virtualbox-modules/files/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: b8d6d2d875d4d1b5a46ef66c7524e197d1f73623 X-VCS-Branch: master Date: Sat, 24 Feb 2024 09:02:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7207cf5e-b00b-4e69-a544-4cdb4542bdd0 X-Archives-Hash: f8b9c24b511cb6dffea045edeca7ff17 commit: b8d6d2d875d4d1b5a46ef66c7524e197d1f73623 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Feb 24 08:59:33 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sat Feb 24 09:01:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8d6d2d8 app-emulation/virtualbox-modules: patch for kernel 6.6 Apply upstream patch for module crash under kenrel 6.6.x. Closes: https://bugs.gentoo.org/923277 Signed-off-by: Viorel Munteanu gentoo.org> ...tualbox-modules-7.0.14-kernel-6.6-warning.patch | 27 ++++++++++++++++++++++ ....ebuild => virtualbox-modules-6.1.48-r1.ebuild} | 4 ++++ ....ebuild => virtualbox-modules-6.1.50-r1.ebuild} | 4 ++++ ....ebuild => virtualbox-modules-7.0.12-r1.ebuild} | 4 ++++ ....ebuild => virtualbox-modules-7.0.14-r1.ebuild} | 4 ++++ 5 files changed, 43 insertions(+) diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch new file mode 100644 index 000000000000..64bafa84e365 --- /dev/null +++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-7.0.14-kernel-6.6-warning.patch @@ -0,0 +1,27 @@ +https://www.virtualbox.org/changeset/103168/vbox +https://bugs.gentoo.org/923277 + +--- a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c ++++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c +@@ -244,9 +244,21 @@ + #if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64) + if (fKernel) + { ++# if RTLNX_VER_MIN(6,6,0) ++ /* In kernel 6.6 mk_pte() macro was fortified with additional ++ * check which does not allow to use our custom mask anymore ++ * (see kernel commit ae1f05a617dcbc0a732fbeba0893786cd009536c). ++ * For this particular mapping case, an existing mask PAGE_KERNEL_ROX ++ * can be used instead. PAGE_KERNEL_ROX was introduced in ++ * kernel 5.8, however, lets apply it for kernels 6.6 and newer ++ * to be on a safe side. ++ */ ++ return PAGE_KERNEL_ROX; ++# else + pgprot_t fPg = MY_PAGE_KERNEL_EXEC; + pgprot_val(fPg) &= ~_PAGE_RW; + return fPg; ++# endif + } + return PAGE_READONLY_EXEC; + #else diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.48-r1.ebuild similarity index 93% copy from app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild copy to app-emulation/virtualbox-modules/virtualbox-modules-6.1.48-r1.ebuild index e6ea30a58fd9..3b1165d18eb7 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.48-r1.ebuild @@ -21,6 +21,10 @@ KEYWORDS="~amd64" CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" +PATCHES=( + "${FILESDIR}"/${PN}-7.0.14-kernel-6.6-warning.patch +) + src_compile() { local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r1.ebuild similarity index 93% rename from app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild rename to app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r1.ebuild index e6ea30a58fd9..3b1165d18eb7 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.50-r1.ebuild @@ -21,6 +21,10 @@ KEYWORDS="~amd64" CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" +PATCHES=( + "${FILESDIR}"/${PN}-7.0.14-kernel-6.6-warning.patch +) + src_compile() { local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.12-r1.ebuild similarity index 93% copy from app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild copy to app-emulation/virtualbox-modules/virtualbox-modules-7.0.12-r1.ebuild index 08e22e5e0379..590b20110b46 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.12-r1.ebuild @@ -21,6 +21,10 @@ KEYWORDS="~amd64" CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" +PATCHES=( + "${FILESDIR}"/${PN}-7.0.14-kernel-6.6-warning.patch +) + src_compile() { local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild similarity index 94% rename from app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild rename to app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild index 08e22e5e0379..5466947cbf9d 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild @@ -21,6 +21,10 @@ KEYWORDS="~amd64" CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" +PATCHES=( + "${FILESDIR}"/${P}-kernel-6.6-warning.patch +) + src_compile() { local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )