eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add extra tests to the MassStorage device demo and class driver for validating command blocks from the host.

This commit is contained in:
Dean Camera 2009-07-21 04:46:48 +00:00
parent 67f390fe74
commit d0db78432f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/Device/LowLevel/MassStorage/MassStorage.c
View File

@ -256,6 +256,8 @@ static bool ReadInCommandBlock(void)
/* Verify the command block - abort if invalid */ /* Verify the command block - abort if invalid */
if ((CommandBlock.Signature != CBW_SIGNATURE) || if ((CommandBlock.Signature != CBW_SIGNATURE) ||
(CommandBlock.LUN >= TOTAL_LUNS) || (CommandBlock.LUN >= TOTAL_LUNS) ||
(CommandBlock.Flags & 0x1F) ||
(CommandBlock.SCSICommandLength == 0) ||
(CommandBlock.SCSICommandLength > MAX_SCSI_COMMAND_LENGTH)) (CommandBlock.SCSICommandLength > MAX_SCSI_COMMAND_LENGTH))
{ {
/* Stall both data pipes until reset by host */ /* Stall both data pipes until reset by host */

2
LUFA/Drivers/USB/Class/Device/MassStorage.c
View File

@ -149,6 +149,8 @@ static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInte
if ((MSInterfaceInfo->State.CommandBlock.Signature != MS_CBW_SIGNATURE) || if ((MSInterfaceInfo->State.CommandBlock.Signature != MS_CBW_SIGNATURE) ||
(MSInterfaceInfo->State.CommandBlock.LUN >= MSInterfaceInfo->Config.TotalLUNs) || (MSInterfaceInfo->State.CommandBlock.LUN >= MSInterfaceInfo->Config.TotalLUNs) ||
(MSInterfaceInfo->State.CommandBlock.Flags & 0x1F) ||
(MSInterfaceInfo->State.CommandBlock.SCSICommandLength == 0) ||
(MSInterfaceInfo->State.CommandBlock.SCSICommandLength > 16)) (MSInterfaceInfo->State.CommandBlock.SCSICommandLength > 16))
{ {
Endpoint_StallTransaction(); Endpoint_StallTransaction();