Changeset 24213 in vbox

Timestamp:

Oct 30, 2009 5:51:30 PM (15 years ago)

Author:

vboxsync

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

54161

Message:

ISCSIHDDCore.cpp: another bugfix for the SCSI_SERVICE_ACTION_IN_16/SCSI_SVC_ACTION_IN_READ_CAPACITY_16 request. zero the output buffer for the capacity reads. log errors. right format types.

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (5 diffs)

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

@@ -490 +490 @@
                                                    pszFormat, va);
     va_end(va);
+
+#ifdef LOG_ENABLED
+    va_start(va, pszFormat);
+    Log(("iscsiError(%d/%s): %N\n", iLine, pszFunction, pszFormat, &va));
+    va_end(va);
+#endif
     return rc;
 }
@@ -2596 +2602 @@
     uint8_t cdb_cap[16];
 
-    memset(cdb_cap, '\0', sizeof(cdb_cap));
+    RT_ZERO(data12);
+    RT_ZERO(cdb_cap);
     cdb_cap[0] = SCSI_SERVICE_ACTION_IN_16;
     cdb_cap[1] = SCSI_SVC_ACTION_IN_READ_CAPACITY_16;   /* subcommand */
+    cdb_cap[10+3] = sizeof(data12);                     /* allocation length (dword) */
 
     sr.enmXfer = SCSIXFER_FROM_TARGET;
@@ -2618 +2626 @@
         pImage->cbSector = RT_BE2H_U32(*(uint32_t *)&data12[8]);
         pImage->cbSize = pImage->cVolume * pImage->cbSector;
-        if (pImage->cVolume == 0 || pImage->cbSector == 0)
+        if (pImage->cVolume == 0 || pImage->cbSector != 512 || pImage->cbSize < pImage->cVolume)
         {
             rc = iscsiError(pImage, VERR_VD_ISCSI_INVALID_TYPE,
-                            RT_SRC_POS, N_("iSCSI: target address %s, target name %s, SCSI LUN %lld reports media sector count=%lu sector size=%lu"),
+                            RT_SRC_POS, N_("iSCSI: target address %s, target name %s, SCSI LUN %lld reports media sector count=%llu sector size=%u"),
                             pImage->pszTargetAddress, pImage->pszTargetName,
                             pImage->LUN, pImage->cVolume, pImage->cbSector);
@@ -2630 +2638 @@
         uint8_t cdb_capfb[10];
 
+        RT_ZERO(data8);
         cdb_capfb[0] = SCSI_READ_CAPACITY;
         cdb_capfb[1] = 0;   /* reserved */
@@ -2658 +2667 @@
             pImage->cbSector = (data8[4] << 24) | (data8[5] << 16) | (data8[6] << 8) | data8[7];
             pImage->cbSize = pImage->cVolume * pImage->cbSector;
-            if (pImage->cVolume == 0 || pImage->cbSector == 0)
+            if (pImage->cVolume == 0 || pImage->cbSector != 512)
             {
                 rc = iscsiError(pImage, VERR_VD_ISCSI_INVALID_TYPE,
-                                RT_SRC_POS, N_("iSCSI: fallback capacity detectio for target address %s, target name %s, SCSI LUN %lld reports media sector count=%lu sector size=%lu"),
+                                RT_SRC_POS, N_("iSCSI: fallback capacity detectio for target address %s, target name %s, SCSI LUN %lld reports media sector count=%llu sector size=%u"),
                                 pImage->pszTargetAddress, pImage->pszTargetName,
                                 pImage->LUN, pImage->cVolume, pImage->cbSector);