Changeset 104171 in vbox

Timestamp:

Apr 5, 2024 9:08:56 AM (8 months ago)

Author:

vboxsync

Message:

Devices/BusLogic: Respond with a invalid command parameter error if the CDB length for a SCSI I/O request is invalid, bugref:10613

File:

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

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

@@ -3222 +3222 @@
 
     uTargetIdCCB = pThis->fMbxIs24Bit ? CCBGuest.o.uTargetId : CCBGuest.n.uTargetId;
-    if (RT_LIKELY(uTargetIdCCB < RT_ELEMENTS(pThisCC->aDeviceStates)))
+    if (   RT_LIKELY(uTargetIdCCB < RT_ELEMENTS(pThisCC->aDeviceStates))
+        && CCBGuest.c.cbCDB <= RT_ELEMENTS(CCBGuest.c.abCDB))
     {
         PBUSLOGICDEVICE pTgtDev = &pThisCC->aDeviceStates[uTargetIdCCB];
@@ -3443 +3444 @@
 
     if (RT_LIKELY(   pCmd->uTargetId < RT_ELEMENTS(pThisCC->aDeviceStates)
-                  && pCmd->cbCDB <= 16))
+                  && pCmd->cbCDB <= RT_ELEMENTS(pCmd->abCDB)))
     {
         PBUSLOGICDEVICE pTgtDev = &pThisCC->aDeviceStates[pCmd->uTargetId];