Changeset 46597 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 17, 2013 3:43:04 PM (11 years ago)

Author:

vboxsync

Message:

VSCSI: Fail unsupported MODE SENSE requests.

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSILunMmc.cpp (modified) (2 diffs)
• VSCSILunSbc.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -262 +262 @@
             uint8_t aReply[24];
             uint8_t *pu8ReplyPos;
+            bool    fValid = false;
 
             memset(aReply, 0, sizeof(aReply));
@@ -277 +278 @@
                 *pu8ReplyPos++ = 0x12; /* Size of the page. */
                 *pu8ReplyPos++ = 0x4;  /* Write cache enabled. */
-            }
-
-            RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply));
-            rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);
+                fValid = true;
+            } else if (uModePage == 0) {
+                fValid = true;
+            }
+
+            /* Querying unknown pages must fail. */
+            if (fValid) {
+                RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply));
+                rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);
+            } else {
+                rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
+            }
             break;
         }

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -256 +256 @@
             uint8_t aReply[24];
             uint8_t *pu8ReplyPos;
+            bool    fValid = false;
 
             memset(aReply, 0, sizeof(aReply));
@@ -274 +275 @@
                 *pu8ReplyPos++ = 0x12; /* Size of the page. */
                 *pu8ReplyPos++ = 0x4;  /* Write cache enabled. */
-            }
-
-            RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply));
-            rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);
+                fValid = true;
+            } else if (uModePage == 0) {
+                fValid = 0;
+            }
+
+            /* Querying unknown pages must fail. */
+            if (fValid) {
+                RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply));
+                rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);
+            } else {
+                rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
+            }
             break;
         }