summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:50:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:50:12 +0000
commitf69fec207d888875c7faf5b4be2e4227fd09e465 (patch)
tree3de5906eee08ac7d9b92fc257e936e298b7dc7c4
parentReleasing progress-linux version 7.0.16-dfsg-2~progress7.99u1. (diff)
downloadvirtualbox-f69fec207d888875c7faf5b4be2e4227fd09e465.tar.xz
virtualbox-f69fec207d888875c7faf5b4be2e4227fd09e465.zip
Merging debian version 7.0.16-dfsg-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/162843.patch11
-rw-r--r--debian/patches/series1
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fa124714..cf3e56dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (7.0.16-dfsg-3) unstable; urgency=medium
+
+ * Add patch 162843 to fix an host crash with some network modes.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 26 Apr 2024 12:51:11 +0200
+
virtualbox (7.0.16-dfsg-2~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-updates, remaining changes:
diff --git a/debian/patches/162843.patch b/debian/patches/162843.patch
new file mode 100644
index 00000000..6652320d
--- /dev/null
+++ b/debian/patches/162843.patch
@@ -0,0 +1,11 @@
+Index: /branches/VBox-7.0/src/VBox/Devices/Network/SrvIntNetR0.cpp
+===================================================================
+--- a/src/VBox/Devices/Network/SrvIntNetR0.cpp (revision 162842)
++++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp (revision 162843)
+@@ -2936,5 +2936,5 @@
+ union
+ {
+- uint8_t abBuf[sizeof(INTNETSG) + sizeof(INTNETSEG)];
++ uint8_t abBuf[sizeof(INTNETSG) + 2 * sizeof(INTNETSEG)];
+ INTNETSG SG;
+ } u;
diff --git a/debian/patches/series b/debian/patches/series
index 07cab078..f13ae574 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
37-do-not-run-if-not-in-vm.patch
+162843.patch