Changeset 40229 in vbox

Timestamp:

Feb 23, 2012 12:22:21 PM (13 years ago)

Author:

vboxsync

Message:

Storage/ISCSI: Don't validate the ExpStatSN field of a Login Respone with a non 0 status class because it is not valid. Fixes a crash when trying to login into a LIO target with wrong credentials.

File:

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

trunk/src/VBox/Storage/ISCSI.cpp

@@ -919 +919 @@
             }
             Assert(cMilliesRemaining < 1000000);
-            rc = pImage->pIfNet->pfnSelectOne(pImage->Socket,
-                                                              cMilliesRemaining);
+            rc = pImage->pIfNet->pfnSelectOne(pImage->Socket, cMilliesRemaining);
             if (RT_FAILURE(rc))
                 break;
-            rc = pImage->pIfNet->pfnRead(pImage->Socket,
-                                                         pDst, residual,
-                                                         &cbActuallyRead);
+            rc = pImage->pIfNet->pfnRead(pImage->Socket, pDst, residual, &cbActuallyRead);
             if (RT_FAILURE(rc))
                 break;
@@ -2091 +2088 @@
                 continue;
             if (    !pImage->FirstRecvPDU
-                &&  (cmd != ISCSIOP_SCSI_DATA_IN || (RT_N2H_U32(pcvResSeg[0]) & ISCSI_STATUS_BIT)))
+                &&  (cmd != ISCSIOP_SCSI_DATA_IN || (RT_N2H_U32(pcvResSeg[0]) & ISCSI_STATUS_BIT))
+                &&  (   cmd != ISCSIOP_LOGIN_RES
+                     || (ISCSILOGINSTATUSCLASS)((RT_N2H_U32(pcvResSeg[9]) >> 24) == ISCSI_LOGIN_STATUS_CLASS_SUCCESS)))
             {
                 if (pImage->ExpStatSN == RT_N2H_U32(pcvResSeg[6]))
@@ -2174 +2173 @@
         }
     }
+
+    LogFlowFunc(("returns rc=%Rrc\n"));
     return rc;
 }