From 3ba5df7f20e357beb9d05e86be6e07795309d8b1fef56cf23851c4a8e7f06e58 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sat, 23 Apr 2016 05:10:51 +0000
Subject: [PATCH] Accepting request 391337 from
 home:lwfinger:branches:Virtualization

Fix LsiLogic adapter error in 5.0.18

OBS-URL: https://build.opensuse.org/request/show/391337
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=253
---
 changeset_60565.diff | 13 +++++++++++++
 virtualbox.changes   | 12 ++++++++++++
 virtualbox.spec      |  3 +++
 3 files changed, 28 insertions(+)
 create mode 100644 changeset_60565.diff

diff --git a/changeset_60565.diff b/changeset_60565.diff
new file mode 100644
index 0000000..6828205
--- /dev/null
+++ b/changeset_60565.diff
@@ -0,0 +1,13 @@
+Index: VirtualBox-5.0.18/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+===================================================================
+--- VirtualBox-5.0.18.orig/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
++++ VirtualBox-5.0.18/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+@@ -3889,7 +3889,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIO
+     else if (RT_FAILURE(rc))
+         AssertMsgFailed(("Writing BIOS register failed %Rrc\n", rc));
+ 
+-    return rc;
++    return VINF_SUCCESS;
+ }
+ 
+ /**
diff --git a/virtualbox.changes b/virtualbox.changes
index 06b3abf..e7abdd8 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Apr 22 19:38:06 UTC 2016 - Larry.Finger@lwfinger.net
+
+-   This submission fixes the bug in VB 5.0.18 that prevents proper operation
+    for guest VMs configured to use a LsiLogic adapter for disks. See ticket:
+    https://www.virtualbox.org/ticket/15317 for a description of the problem,
+    and changeset: https://www.virtualbox.org/changeset/60565/vbox for the fix,
+    which is implemented in file "changeset_60565.diff".
+ 
+    This update contains a fix for CVE-2016-0678. Bug report b.o.o #97366
+    discusses this vulnerability.
+
 -------------------------------------------------------------------
 Wed Apr 20 05:02:21 UTC 2016 - Larry.Finger@lwfinger.net
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 325a9ef..6c334b3 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -85,6 +85,8 @@ Patch108:       virtualbox-snpritnf-buffer-overflow.patch
 Patch109:       vbox-usb-warning.diff
 # Prevent Guest Additions from creating wrong SONAME
 Patch111:       vbox_prevent_wrong_SONAME.patch
+# Apply Changeset 60565 - Fix bug in DevLsiLogicSCSI.cpp
+Patch112:       changeset_60565.diff
 #
 BuildRequires:  LibVNCServer-devel
 BuildRequires:  SDL-devel
@@ -316,6 +318,7 @@ This package contains icons for guest desktop files that were created on the des
 %patch108 -p1
 %patch109 -p1
 %patch111 -p1
+%patch112 -p1
 #copy user manual
 cp %{SOURCE1} UserManual.pdf
 #copy kbuild config