Changeset 35595 in vbox for trunk/src

Timestamp:

Jan 17, 2011 8:05:15 PM (14 years ago)

Author:

vboxsync

Message:

Storage/DevATA+ATAController: only allow read/write commands for ATA devices

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (6 diffs)
• DevATA.cpp (modified) (6 diffs)

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

@@ -2922 +2922 @@
         case ATA_READ_SECTORS:
         case ATA_READ_SECTORS_WITHOUT_RETRIES:
-            if (!s->pDrvBlock)
+            if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = 1;
@@ -2931 +2931 @@
         case ATA_WRITE_SECTORS:
         case ATA_WRITE_SECTORS_WITHOUT_RETRIES:
+            if (!s->pDrvBlock || s->fATAPI)
+                goto abort_cmd;
             s->cSectorsPerIRQ = 1;
             ataStartTransfer(s, ataGetNSectors(s) * 512, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
@@ -2937 +2939 @@
             s->fLBA48 = true;
         case ATA_READ_MULTIPLE:
-            if (!s->cMultSectors)
+            if (!s->pDrvBlock || !s->cMultSectors || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
@@ -2945 +2947 @@
             s->fLBA48 = true;
         case ATA_WRITE_MULTIPLE:
-            if (!s->cMultSectors)
+            if (!s->pDrvBlock || !s->cMultSectors || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
@@ -2954 +2956 @@
         case ATA_READ_DMA:
         case ATA_READ_DMA_WITHOUT_RETRIES:
-            if (!s->pDrvBlock)
+            if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;
@@ -2964 +2966 @@
         case ATA_WRITE_DMA:
         case ATA_WRITE_DMA_WITHOUT_RETRIES:
-            if (!s->pDrvBlock)
+            if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;

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

@@ -3654 +3654 @@
         case ATA_READ_SECTORS:
         case ATA_READ_SECTORS_WITHOUT_RETRIES:
-            if (!s->pDrvBlock)
+            if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = 1;
@@ -3663 +3663 @@
         case ATA_WRITE_SECTORS:
         case ATA_WRITE_SECTORS_WITHOUT_RETRIES:
+            if (!s->pDrvBlock || s->fATAPI)
+                goto abort_cmd;
             s->cSectorsPerIRQ = 1;
             ataStartTransfer(s, ataGetNSectors(s) * 512, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
@@ -3669 +3671 @@
             s->fLBA48 = true;
         case ATA_READ_MULTIPLE:
-            if (!s->cMultSectors)
+            if (!s->pDrvBlock || !s->cMultSectors || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
@@ -3677 +3679 @@
             s->fLBA48 = true;
         case ATA_WRITE_MULTIPLE:
-            if (!s->cMultSectors)
+            if (!s->pDrvBlock || !s->cMultSectors || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
@@ -3686 +3688 @@
         case ATA_READ_DMA:
         case ATA_READ_DMA_WITHOUT_RETRIES:
-            if (!s->pDrvBlock)
+            if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;
@@ -3696 +3698 @@
         case ATA_WRITE_DMA:
         case ATA_WRITE_DMA_WITHOUT_RETRIES:
-            if (!s->pDrvBlock)
+            if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;