Changeset 85134 in vbox

Timestamp:

Jul 9, 2020 6:46:30 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139077

Message:

Devices/Storage/LsiLogic: Fix regression introduced in r139017, bugref:9767

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -1402 +1402 @@
                 /*
                  * We are already performing a doorbell function.
-                 * Get the remaining parameters.
+                 * Get the remaining parameters, ignore any excess writes.
                  */
-                AssertMsg(pThis->iMessage < RT_ELEMENTS(pThis->aMessage), ("Message is too big to fit into the buffer\n"));
+                AssertMsgReturn(pThis->iMessage < pThis->cMessage,
+                                ("Guest is trying to write more than was indicated in the handshake\n"),
+                                VINF_SUCCESS);
+
                 /*
                  * If the last byte of the message is written, force a switch to R3 because some requests might force
@@ -1420 +1423 @@
                                                              (PMptMessageHdr)pThis->aMessage, &pThis->ReplyBuffer);
                     AssertRC(rc);
-
-                    pThis->iMessage = 0;
                 }
 #endif