From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/, app-emulation/virtualbox-modules/files/
Date: Sat, 24 Feb 2024 09:02:10 +0000 (UTC) [thread overview]
Message-ID: <1708765315.b8d6d2d875d4d1b5a46ef66c7524e197d1f73623.ceamac@gentoo> (raw)
commit: b8d6d2d875d4d1b5a46ef66c7524e197d1f73623
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 08:59:33 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> 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 <ceamac <AT> 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}" )
next reply other threads:[~2024-02-24 9:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-24 9:02 Viorel Munteanu [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-24 7:30 [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/, app-emulation/virtualbox-modules/files/ Viorel Munteanu
2025-05-29 17:22 Viorel Munteanu
2025-05-29 8:46 Viorel Munteanu
2023-08-14 15:29 Viorel Munteanu
2020-12-14 10:56 Lars Wendler
2019-11-27 12:17 Lars Wendler
2018-02-16 13:12 Lars Wendler
2016-12-18 11:41 Justin Lecher
2016-07-14 9:28 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1708765315.b8d6d2d875d4d1b5a46ef66c7524e197d1f73623.ceamac@gentoo \
--to=ceamac@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox