Changeset 87120 in vbox

Timestamp:

Dec 24, 2020 10:17:49 AM (4 years ago)

Author:

vboxsync

Message:

DevATA: Reject NATIVE MAX ADDRESS reads on ATAPI devices (see bugref:9860)/

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (3 diffs)

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

@@ -1669 +1669 @@
     {
         /* CHS */
+        AssertMsgReturnVoid(s->PCHSGeometry.cHeads && s->PCHSGeometry.cSectors, ("Device geometry not set!\n"));
         cyl = iLBA / (s->PCHSGeometry.cHeads * s->PCHSGeometry.cSectors);
         r = iLBA % (s->PCHSGeometry.cHeads * s->PCHSGeometry.cSectors);
@@ -4428 +4429 @@
             break;
         case ATA_READ_NATIVE_MAX_ADDRESS_EXT:
+            if (!pDevR3->pDrvMedia || s->fATAPI)
+                goto abort_cmd;
             s->fLBA48 = true;
             ataR3SetSector(s, s->cTotalSectors - 1);
@@ -4438 +4441 @@
             break;
         case ATA_READ_NATIVE_MAX_ADDRESS:
+            if (!pDevR3->pDrvMedia || s->fATAPI)
+                goto abort_cmd;
             ataR3SetSector(s, RT_MIN(s->cTotalSectors, 1 << 28) - 1);
             ataR3CmdOK(pCtl, s, 0);