virtualbox/fixes_for_leap15.5.patch
Larry Rainey 030c30350e Accepting request 1060705 from home:larryr:branches:Virtualization
- VirtualBox 7.0.6 (released January 17 2023)
This is a maintenance release. The following items were fixed and/or added: [1]
- VMM: Fixed guru running the FreeBSD loader on older Intel CPUs without unrestricted guest support (bug #21332)
- GUI: Fixed virtual machines grouping when VM was created or modified in command line (bugs #11500, #20933)
- GUI: Introduced generic changes in settings dialogs
- VirtioNet: Fixed broken network after loading saved state (bug #21172)
- Storage: Added support for increasing the size of the following VMDK image variants: monolithicFlat, monolithicSparse, twoGbMaxExtentSparse, twoGbMaxExtentFlat
- VBoxManage: Added missing --directory switch for guestcontrol mktemp command
- Mouse Integration: Guest was provided with extended host mouse state (bug #21139)
- DnD: Introduced generic improvements
- Guest Control: Fixed handling creation mode for temporary directories (bug #21394)
- Linux Host and Guest: Added initial support for building UEK7 kernel on Oracle Linux 8
- Linux Host and Guest: Added initial support for RHEL 9.1 kernel
- Linux Guest Additions: Added initial support for kernel 6.2 for vboxvideo
- Audio: The "--audio" option in VBoxManage is now marked as deprecated; please use "--audio-driver" and "--audio-enabled" instead. This will allow more flexibility when changing the driver and/or controlling the audio functionality 
Additionally, it fixes 6 CVE's: [2]
CVE-2023-21886 	Oracle VM VirtualBox 	Core 	Multiple 	Yes 	8.1 	Network 	High 	None 	None 	Un-
changed 	High 	High 	High 	Prior to 6.1.42, prior to 7.0.6 	 
CVE-2023-21898 	Oracle VM VirtualBox 	Core 	None 	No 	5.5 	Local 	Low 	Low 	None 	Un-
changed 	None 	None 	High 	Prior to 6.1.42, prior to 7.0.6 	See Note 1
CVE-2023-21899 	Oracle VM VirtualBox 	Core 	None 	No 	5.5 	Local 	Low 	Low 	None 	Un-
changed 	None 	None 	High 	Prior to 6.1.42, prior to 7.0.6 	See Note 1
CVE-2023-21884 	Oracle VM VirtualBox 	Core 	None 	No 	4.4 	Local 	Low 	High 	None 	Un-
changed 	None 	None 	High 	Prior to 6.1.42, prior to 7.0.6 	 
CVE-2023-21885 	Oracle VM VirtualBox 	Core 	None 	No 	3.8 	Local 	Low 	Low 	None 	Changed 	Low 	None 	None 	Prior to 6.1.42, prior to 7.0.6 	See Note 2
CVE-2023-21889 	Oracle VM VirtualBox 	Core 	None 	No 	3.8 	Local 	Low 	Low 	None 	Changed 	Low 	None 	None 	Prior to 6.1.42, prior to 7.0.6 	 
								
Note 1: Applies to VirtualBox VMs running Windows 7 and later.
Note 2: Applies to Windows only.
Links:

OBS-URL: https://build.opensuse.org/request/show/1060705
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=673
2023-01-24 21:49:25 +00:00

120 lines
4.6 KiB
Diff

Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -160,9 +160,9 @@
# include <drm/drm_device.h>
# include <drm/drm_ioctl.h>
# include <drm/drm_fourcc.h>
-# if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
-# include <drm/drm_irq.h>
-# endif
+//# if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
+//# include <drm/drm_irq.h>
+//# endif
# include <drm/drm_vblank.h>
#else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */
# include <drm/drmP.h>
@@ -188,9 +188,7 @@
# include <drm/ttm/ttm_resource.h>
#endif
-#if RTLNX_VER_MIN(6,0,0)
# include <drm/drm_framebuffer.h>
-#endif
#include "vboxvideo_guest.h"
#include "vboxvideo_vbe.h"
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -52,13 +52,7 @@
/** Detect whether kernel mode setting is OFF. */
#if defined(CONFIG_VGA_CONSOLE)
-# if RTLNX_VER_MIN(5,17,0)
# define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset == -1
-# elif RTLNX_VER_MIN(4,7,0)
-# define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
-# else /* < 4.7.0 */
-# define VBOX_VIDEO_NOMODESET() 0
-# endif /* < 4.7.0 */
#else /* !CONFIG_VGA_CONSOLE */
# define VBOX_VIDEO_NOMODESET() 0
#endif /* !CONFIG_VGA_CONSOLE */
@@ -369,7 +363,7 @@ static struct drm_driver driver = {
#endif
.fops = &vbox_fops,
-#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
+#if RTLNX_VER_MIN(5,15,0)
.irq_handler = vbox_irq_handler,
#endif
.name = DRIVER_NAME,
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_irq.c
===================================================================
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_irq.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_irq.c
@@ -205,21 +205,11 @@ int vbox_irq_init(struct vbox_private *v
{
INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
vbox_update_mode_hints(vbox);
-#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,1)
return request_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox_irq_handler, IRQF_SHARED, vbox->dev->driver->name, vbox->dev);
-#elif RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
- return drm_irq_install(vbox->dev, VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq);
-#else
- return drm_irq_install(vbox->dev);
-#endif
}
void vbox_irq_fini(struct vbox_private *vbox)
{
-#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,1)
free_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox->dev);
-#else
- drm_irq_uninstall(vbox->dev);
-#endif
flush_work(&vbox->hotplug_work);
}
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -320,7 +320,7 @@ static struct ttm_tt *vbox_ttm_tt_create
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
if (ttm_tt_init(tt, bo, page_flags)) {
-#elif RTLNX_VER_MAX(5,19,0)
+#elif RTLNX_VER_MAX(5,14,0)
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
#else
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
@@ -622,11 +622,7 @@ int vbox_bo_create(struct drm_device *de
drm_vma_node_reset(&vboxbo->bo.base.vma_node);
#endif
-#if RTLNX_VER_MIN(6,1,0)
ret = ttm_bo_init_validate(&vbox->ttm.bdev, &vboxbo->bo,
-#else
- ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
-#endif /* < 6.1.0 */
ttm_bo_type_device, &vboxbo->placement,
#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
align >> PAGE_SHIFT, false, NULL, acc_size,
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -46,9 +46,7 @@
# include <drm/drm_probe_helper.h>
#endif
-#if RTLNX_VER_MIN(6,0,0)
# include <drm/drm_edid.h>
-#endif
#include "VBoxVideo.h"