Changeset 62750 in vbox for trunk/src/VBox/Storage

Timestamp:

Jul 30, 2016 4:18:24 PM (9 years ago)

Author:

vboxsync

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

109328

Message:

Storage: MSC understandably is a little confused about the state in iscsiAttach, I mean, who isn't? Our MSC version is evidently to simple to figure out that iscsiCommandSync is just fine.

File:

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

trunk/src/VBox/Storage/ISCSI.cpp

@@ -1218 +1218 @@
 static DECLCALLBACK(int) iscsiAttach(void *pvUser)
 {
-    int rc;
+    int rc = VINF_SUCCESS;      /* (MSC is used uninitialized) */
     uint32_t itt;
     uint32_t csg, nsg, substate;
@@ -1227 +1227 @@
     uint8_t pbChallenge[1024];  /* RFC3720 specifies this as maximum. */
     size_t cbChallenge = 0;     /* shut up gcc */
-    uint8_t bChapIdx;
+    uint8_t bChapIdx = 0;       /* (MSC is used uninitialized) */
     uint8_t aResponse[RTMD5HASHSIZE];
     uint32_t cnISCSIReq = 0;
@@ -1540 +1540 @@
                                 }
                                 rc = RTStrToUInt8Ex(pcszChapIdxTarget, &pszNext, 0, &bChapIdx);
-                                if ((rc > VINF_SUCCESS) || *pszNext != '\0')
+/** @todo r=bird: Unsafe use of pszNext on failure.  The code should probably
+ *        use RTStrToUInt8Full and check for rc != VINF_SUCCESS. */
+                                if (rc > VINF_SUCCESS || *pszNext != '\0')
                                 {
                                     rc = VERR_PARSE_ERROR;
@@ -3688 +3690 @@
         if (fRetry)
         {
+            rc = VINF_SUCCESS; /* (MSC incorrectly thinks it can be uninitialized) */
             for (unsigned i = 0; i < 10; i++)
             {