forked from pool/virtualbox
774808da50
- Version bump to 6.1.34 (released March 22 2022) by Oracle This is a maintenance release. The following items were fixed and/or added: VMM: Fix instruction emulation for "cmpxchg16b" GUI: Improved GUI behavior on macOS Big Sur and later when kernel extensions are not loaded EHCI: Addressed an issue with handling short packets (bug #20726) Storage: Fixed a potential hang during disk I/O when the host I/O cache is disabled (bug #20875) NVMe: Fixed loading saved state when nothing is attached to it (bug #20791) DevPcBios: Addressed an issue which resulted in rejecting the detected LCHS geometry when the head count was above 16 virtio-scsi: Improvements E1000: Improve descriptor handling VBoxManage: Fixed handling of command line arguments with incomplete quotes (bug #20740) VBoxManage: Improved 'natnetwork list' output VBoxManage: NATNetwork: Provide an option (--ipv6-prefix) to set IPv6 prefix VBoxManage: NATNetwork: Provide an option (--ipv6-default) to advertise default IPv6 route (bug #20714) VBoxManage: Fix documentation of "usbdevsource add" (bug #20849) Networking: General improvements in IPv4 and IPv6 area (bug #20714) OVF Import: Allow users to specify a different storage controller and/or controller port for hard disks when importing a VM Unattended install: Improvements Shared Clipboard: Improved HTML clipboard handling for Windows host Linux host and guest: Introduced initial support for kernel 5.17 Solaris package: Fixes for API access from Python Solaris IPS package: Suppress dependency on libpython2.7.so.* Linux host and guest: Fixes for Linux kernel 5.14 Linux Guest Additions: Fixed guest screen resize for older guests which are running libXrandr older than version 1.4 Linux Guest Additions: Introduced initial support for RHEL 8.6 kernels (bug #20877) Windows guest: Make driver install smarter Solaris guest: Addressed an issue which prevented VBox GAs 6.1.30 or 6.1.32 from being removed in Solaris 10 guests (bug #20780) EFI: Fixed booting from FreeBSD ISO images (bug #19910) Removed file "fixes_for_kernel_5.17.patch" - fixed upstream. Fixes CVE-2022-21465 (boo#1198676), CVE-2022-21471 (boo#1198677), CVE-2022-21491 (boo#1198680), CVE-2022-21487 (boo#1198678), and CVE-2022-21488 (boo#1198679). Fixed boo#1198703 - package virtualbox-websrv needs sysvinit-tools OBS-URL: https://build.opensuse.org/request/show/975263 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=631
88 lines
4.9 KiB
Diff
88 lines
4.9 KiB
Diff
Index: VirtualBox-6.1.34/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.34.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
+++ VirtualBox-6.1.34/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
@@ -2311,7 +2311,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS
|
|
vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
|
|
Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
|
|
Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
|
|
+#if RTLNX_VER_MIN(5,18,0)
|
|
+ local_bh_disable();
|
|
+ err = netif_rx(pBuf);
|
|
+ local_bh_enable();
|
|
+#else
|
|
err = netif_rx_ni(pBuf);
|
|
+#endif
|
|
if (err)
|
|
rc = RTErrConvertFromErrno(err);
|
|
}
|
|
Index: VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPDrv.cpp
|
|
===================================================================
|
|
--- VirtualBox-6.1.34.orig/src/VBox/HostDrivers/Support/SUPDrv.cpp
|
|
+++ VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPDrv.cpp
|
|
@@ -1742,7 +1742,15 @@ static int supdrvIOCtlInnerUnrestricted(
|
|
|
|
/* execute */
|
|
pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
|
|
+
|
|
+ /* In 5.18.0, memcpy became a wrapper which does fortify checks
|
|
+ * before triggering __underlying_memcpy() call. We do not pass these checks here,
|
|
+ * so bypass them for now. */
|
|
+#if RTLNX_VER_MIN(5,18,0)
|
|
+ __underlying_memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
|
|
+#else
|
|
memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
|
|
+#endif
|
|
pReq->Hdr.rc = VINF_SUCCESS;
|
|
return 0;
|
|
}
|
|
Index: VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPLib.cpp
|
|
===================================================================
|
|
--- VirtualBox-6.1.34.orig/src/VBox/HostDrivers/Support/SUPLib.cpp
|
|
+++ VirtualBox-6.1.34/src/VBox/HostDrivers/Support/SUPLib.cpp
|
|
@@ -505,7 +505,7 @@ static int supInitFake(PSUPDRVSESSION *p
|
|
if (g_pSupFunctions)
|
|
{
|
|
g_pSupFunctions->u.Out.cFunctions = RT_ELEMENTS(s_aFakeFunctions);
|
|
- memcpy(&g_pSupFunctions->u.Out.aFunctions[0], &s_aFakeFunctions[0], sizeof(s_aFakeFunctions));
|
|
+ memcpy(&g_pSupFunctions->u.Out.aFunctions, &s_aFakeFunctions[0], sizeof(s_aFakeFunctions));
|
|
g_pSession = (PSUPDRVSESSION)(void *)g_pSupFunctions;
|
|
if (ppSession)
|
|
*ppSession = g_pSession;
|
|
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/sharedfolders/regops.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/sharedfolders/regops.c
|
|
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/sharedfolders/regops.c
|
|
@@ -3823,7 +3823,9 @@ struct address_space_operations vbsf_reg
|
|
.readpage = vbsf_readpage,
|
|
.writepage = vbsf_writepage,
|
|
/** @todo Need .writepages if we want msync performance... */
|
|
-#if RTLNX_VER_MIN(2,5,12)
|
|
+#if RTLNX_VER_MIN(5,18,0)
|
|
+ .dirty_folio = block_dirty_folio,
|
|
+#elif RTLNX_VER_MIN(2,5,12)
|
|
.set_page_dirty = __set_page_dirty_buffers,
|
|
#endif
|
|
#if RTLNX_VER_MIN(5,14,0)
|
|
Index: VirtualBox-6.1.34/Config.kmk
|
|
===================================================================
|
|
--- VirtualBox-6.1.34.orig/Config.kmk
|
|
+++ VirtualBox-6.1.34/Config.kmk
|
|
@@ -4502,11 +4502,14 @@ ifeq ($(VBOX_LDR_FMT),elf)
|
|
TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
|
|
TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
|
|
$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
|
|
- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
|
|
+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
|
|
TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
|
|
$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
|
|
$(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
|
|
-fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
|
|
+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
|
|
+ TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding
|
|
+ endif
|
|
TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
|
|
TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
|
|
TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding
|
|
|