Changeset 39010 in vbox

Timestamp:

Oct 17, 2011 6:37:32 PM (13 years ago)

Author:

vboxsync

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

74415

Message:

DevATA/Passthrough: Abort commands which exceed the I/O buffer size, workaround for crashes with newer versions of brasero during the verification process

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (1 diff)

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

@@ -3583 +3583 @@
             /* Send a command to the drive, passing data in/out as required. */
             Log2(("ATAPI PT: max size %d\n", cbTransfer));
-            Assert(cbTransfer <= s->cbIOBuffer);
-            if (cbTransfer == 0)
-                uTxDir = PDMBLOCKTXDIR_NONE;
-            ataStartTransfer(s, cbTransfer, uTxDir, ATAFN_BT_ATAPI_PASSTHROUGH_CMD, ATAFN_SS_ATAPI_PASSTHROUGH, true);
+            if (cbTransfer > s->cbIOBuffer)
+            {
+                /* Rate limited logging, one log line every 5 seconds. */
+                static uint64_t uLastLogTS = 0;
+                if (RTTimeMilliTS() >= uLastLogTS + 5000)
+                {
+                    LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough command attempted to exceed buffer size, blocked\n", s->iLUN));
+                    uLastLogTS = RTTimeMilliTS();
+                }
+                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+            }
+            else
+            {
+                if (cbTransfer == 0)
+                    uTxDir = PDMBLOCKTXDIR_NONE;
+                ataStartTransfer(s, cbTransfer, uTxDir, ATAFN_BT_ATAPI_PASSTHROUGH_CMD, ATAFN_SS_ATAPI_PASSTHROUGH, true);
+            }
     }
 }