tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/NvmExpressDxe: Refine data buffer & len check in PassThru 

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1142

According to the the NVM Express spec Revision 1.1, for some commands
(like Get/Set Feature Command, Figure 89 & 90 of the spec), the Memory
Buffer maybe optional although the command opcode indicates there is a
data transfer between host & controller (Get/Set Feature Command, Figure
38 of the spec).

Hence, this commit refine the checks for the 'TransferLength' and
'TransferBuffer' field of the EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET
structure to address this issue.

Cc: Liangcheng Tang <liangcheng.tang@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Hao Wu 2018-10-17 10:50:51 +08:00
parent 27bf6712b4
commit ebb6c7633b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
View File

@ -595,7 +595,8 @@ NvmExpressPassThru (
// //
if (((Sq->Opc & (BIT0 | BIT1)) != 0) && if (((Sq->Opc & (BIT0 | BIT1)) != 0) &&
!((Packet->QueueType == NVME_ADMIN_QUEUE) && ((Sq->Opc == NVME_ADMIN_CRIOCQ_CMD) || (Sq->Opc == NVME_ADMIN_CRIOSQ_CMD)))) { !((Packet->QueueType == NVME_ADMIN_QUEUE) && ((Sq->Opc == NVME_ADMIN_CRIOCQ_CMD) || (Sq->Opc == NVME_ADMIN_CRIOSQ_CMD)))) {
if ((Packet->TransferLength == 0) || (Packet->TransferBuffer == NULL)) { if (((Packet->TransferLength != 0) && (Packet->TransferBuffer == NULL)) ||
((Packet->TransferLength == 0) && (Packet->TransferBuffer != NULL))) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -605,21 +606,23 @@ NvmExpressPassThru (
Flag = EfiPciIoOperationBusMasterWrite; Flag = EfiPciIoOperationBusMasterWrite;
} }
MapLength = Packet->TransferLength; if ((Packet->TransferLength != 0) && (Packet->TransferBuffer != NULL)) {
Status = PciIo->Map ( MapLength = Packet->TransferLength;
PciIo, Status = PciIo->Map (
Flag, PciIo,
Packet->TransferBuffer, Flag,
&MapLength, Packet->TransferBuffer,
&PhyAddr, &MapLength,
&MapData &PhyAddr,
); &MapData
if (EFI_ERROR (Status) || (Packet->TransferLength != MapLength)) { );
return EFI_OUT_OF_RESOURCES; if (EFI_ERROR (Status) || (Packet->TransferLength != MapLength)) {
} return EFI_OUT_OF_RESOURCES;
}
Sq->Prp[0] = PhyAddr; Sq->Prp[0] = PhyAddr;
Sq->Prp[1] = 0; Sq->Prp[1] = 0;
}
if((Packet->MetadataLength != 0) && (Packet->MetadataBuffer != NULL)) { if((Packet->MetadataLength != 0) && (Packet->MetadataBuffer != NULL)) {
MapLength = Packet->MetadataLength; MapLength = Packet->MetadataLength;