Changeset 25900 in vbox

Timestamp:

Jan 18, 2010 3:39:35 PM (15 years ago)

Author:

vboxsync

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

56712

Message:

Same goes for the write handler and the duplicate ATAController code.

Location:

trunk/src/VBox/Devices/Storage

Files:

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

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

@@ -4693 +4693 @@
         cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
 #ifndef IN_RING3
+        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
+        if (!cTransAvailable)
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            return VINF_IOM_HC_IOPORT_READ;
+        }
         /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
         cTransAvailable--;
@@ -4739 +4745 @@
         cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
 #ifndef IN_RING3
+        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
+        if (!cTransAvailable)
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            return VINF_IOM_HC_IOPORT_WRITE;
+        }
         /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
         cTransAvailable--;

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

@@ -5394 +5394 @@
             return VINF_IOM_HC_IOPORT_READ;
         }
-
         /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
         cTransAvailable--;
@@ -5447 +5446 @@
         cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
 #ifndef IN_RING3
+        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
+        if (!cTransAvailable)
+        {
+            PDMCritSectLeave(&pCtl->lock);
+            return VINF_IOM_HC_IOPORT_WRITE;
+        }
         /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
         cTransAvailable--;