forked from pool/virtualbox
ee37db802f
- Version bump to 6.1.28 (released October 19 2021 by Oracle) This is a maintenance release. The following items were fixed and/or added: VMM: Fixed guru meditation while booting nested-guests accessing debug registers under certain conditions UI: Bug fixes for touchpad-based scrolling VMSVGA: Fixed VM black screen issue on first resize after restoring from saved state (bug #20067) VMSVGA: Fixed display corruption on Linux Mint (bug #20513) Storage: Fixed a possible write error under certain circumstances when using VHD images (bug #20512) Network: Multiple updates in virtio-net device support Network: Disconnecting cable in saved VM state now is handled properly by virtio-net Network: More administrative control over network ranges, see user manual NAT: Fixed not rejecting TFTP requests with absolute pathnames (bug #20589) Audio: Fixed VM session aborting after PC hibernation (bug #20516) Audio: Fixed setting the line-in volume of the HDA emulation on modern Linux guests Audio: Fixed resuming playback of the AC'97 emulation while a snapshot has been taken API: Added bindings support for Python 3.9 (bug #20252) API: Fixed rare hang of VM when changing settings at runtime Linux host: Improved kernel modules installation detection which prevents unnecessary modules rebuild Host Services: Shared Clipboard: Prevent guest clipboard reset when clipboard sharing is disabled (bug #20487) Host Services: Shared Clipboard over VRDP: Fixed to continue working when guest service reconnects to host (bug #20366) Host Services: Shared Clipboard over VRDP: Fixed preventing remote RDP client to hang when guest has no clipboard data to report Linux Host and Guest: Introduced initial support for kernels 5.14 and 5.15 Linux Host and Guest: Introduced initial support for RHEL 8.5 kernel Windows Guest: Introduced Windows 11 guest support, including unattended installation Deleted file "fix_ordering_of_qt_includes.patch" - fixed upstream. Fixes CVE-2021-35538, CVE-2021-35545, CVE-2021-35540, CVE-2021-35542, and CVE-2021-2475 (boo#1191869) OBS-URL: https://build.opensuse.org/request/show/926822 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=621
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
Index: VirtualBox-6.1.28/src/VBox/Additions/linux/sharedfolders/regops.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/sharedfolders/regops.c
|
|
+++ VirtualBox-6.1.28/src/VBox/Additions/linux/sharedfolders/regops.c
|
|
@@ -2138,7 +2138,11 @@ static int vbsf_iter_lock_pages(struct i
|
|
int rc = 0;
|
|
|
|
Assert(iov_iter_count(iter) + pStash->cb > 0);
|
|
+#if RTLNX_VER_MAX(5, 14,0)
|
|
if (!(VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
|
|
+#else
|
|
+ if (!iov_iter_is_kvec(iter)) {
|
|
+#endif
|
|
/*
|
|
* Do we have a stashed page?
|
|
*/
|
|
@@ -2385,7 +2389,11 @@ static size_t vbsf_iter_max_span_of_page
|
|
{
|
|
size_t cPages;
|
|
# if RTLNX_VER_MIN(3,16,0)
|
|
+# if RTLNX_VER_MAX(5, 14, 0)
|
|
if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
|
|
+#else
|
|
+ if (iter_is_iovec(iter) || iov_iter_is_kvec(iter)) {
|
|
+#endif
|
|
# endif
|
|
const struct iovec *pCurIov = iter->iov;
|
|
size_t cLeft = iter->nr_segs;
|
|
@@ -2448,7 +2456,11 @@ static size_t vbsf_iter_max_span_of_page
|
|
} else {
|
|
/* Won't bother with accurate counts for the next two types, just make
|
|
some rough estimates (does pipes have segments?): */
|
|
+#if RTLNX_VER_MAX(5, 14,0)
|
|
size_t cSegs = VBSF_GET_ITER_TYPE(iter) & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1;
|
|
+#else
|
|
+ size_t cSegs = (iov_iter_type(iter) == ITER_BVEC) ? RT_MAX(1, iter->nr_segs) : 1;
|
|
+#endif
|
|
cPages = (iov_iter_count(iter) + (PAGE_SIZE * 2 - 2) * cSegs) >> PAGE_SHIFT;
|
|
}
|
|
# endif
|
|
@@ -3831,7 +3843,9 @@ struct address_space_operations vbsf_reg
|
|
.write_end = vbsf_write_end,
|
|
#elif RTLNX_VER_MIN(2,6,24)
|
|
.write_begin = vbsf_write_begin,
|
|
+#if RTLNX_VER_MAX(5, 14, 0)
|
|
.write_end = simple_write_end,
|
|
+#endif
|
|
#elif RTLNX_VER_MIN(2,5,45)
|
|
.prepare_write = simple_prepare_write,
|
|
.commit_write = simple_commit_write,
|