X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FIScsiDxe%2FIScsiProto.c;h=9fb848080af37cd24a291829b4cab1f5d1f8d6bc;hb=131818ba5a83d1e8f3f1b4c041200755fff64abb;hp=0853f987675f527553c91455f22923399e1c43a3;hpb=328ce03e55c2d802e1c83739d51c54bbcc92d87b;p=mirror_edk2.git
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 0853f98767..9fb848080a 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -1,7 +1,7 @@
/** @file
The implementation of iSCSI protocol based on RFC3720.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
UINT32 mDataSegPad = 0;
/**
- Attach the iSCSI connection to the iSCSI session.
+ Attach the iSCSI connection to the iSCSI session.
@param[in, out] Session The iSCSI session.
@param[in, out] Conn The iSCSI connection.
@@ -34,7 +34,7 @@ IScsiAttatchConnection (
}
/**
- Detach the iSCSI connection from the session it belongs to.
+ Detach the iSCSI connection from the session it belongs to.
@param[in, out] Conn The iSCSI connection.
**/
@@ -49,7 +49,7 @@ IScsiDetatchConnection (
}
/**
- Check the sequence number according to RFC3720.
+ Check the sequence number according to RFC3720.
@param[in, out] ExpSN The currently expected sequence number.
@param[in] NewSN The sequence number to check.
@@ -116,7 +116,7 @@ IScsiUpdateCmdSN (
@retval EFI_SUCCESS The iSCSI connection is logged into the iSCSI target.
@retval EFI_TIMEOUT Timeout happened during the login procedure.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiConnLogin (
@@ -289,16 +289,16 @@ IScsiSessionLogin (
ISCSI_SESSION *Session;
ISCSI_CONNECTION *Conn;
EFI_TCP4_PROTOCOL *Tcp4;
- BOOLEAN MediaPresent;
+ EFI_STATUS MediaStatus;
Session = &Private->Session;
//
// Check media status before session login
//
- MediaPresent = TRUE;
- NetLibDetectMedia (Private->Controller, &MediaPresent);
- if (!MediaPresent) {
+ MediaStatus = EFI_SUCCESS;
+ NetLibDetectMediaWaitTimeout (Private->Controller, ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME, &MediaStatus);
+ if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA;
}
@@ -381,7 +381,7 @@ IScsiSendLoginReq (
Receive and process the iSCSI login response.
@param[in] Conn The connection in the iSCSI login phase.
-
+
@retval EFI_SUCCESS The iSCSI login response PDU is received and processed.
@retval Others Other errors as indicated.
**/
@@ -393,6 +393,8 @@ IScsiReceiveLoginRsp (
EFI_STATUS Status;
NET_BUF *Pdu;
+ Pdu = NULL;
+
//
// Receive the iSCSI login response.
//
@@ -441,6 +443,9 @@ IScsiAddKeyValuePair (
CHAR8 *Data;
LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, NULL);
+ if (LoginReq == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
DataSegLen = NTOH24 (LoginReq->DataSegmentLength);
KeyLen = (UINT32) AsciiStrLen (Key);
@@ -607,6 +612,9 @@ IScsiProcessLoginRsp (
Session = Conn->Session;
LoginRsp = (ISCSI_LOGIN_RESPONSE *) NetbufGetByte (Pdu, 0, NULL);
+ if (LoginRsp == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
if (!ISCSI_CHECK_OPCODE (LoginRsp, ISCSI_OPCODE_LOGIN_RSP)) {
//
// It's not a Login Response
@@ -799,7 +807,7 @@ IScsiProcessLoginRsp (
@param[in] Data The data segment which should contain the
TargetAddress key-value list.
@param[in] Len Length of the data.
-
+
@retval EFI_SUCCESS The target address is updated.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_NOT_FOUND The TargetAddress key is not found.
@@ -1217,12 +1225,14 @@ IScsiCheckOpParams (
//
// InitialR2T, result function is OR.
//
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_INITIAL_R2T);
- if (Value == NULL) {
- goto ON_ERROR;
- }
+ if (!Session->InitialR2T) {
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_INITIAL_R2T);
+ if (Value == NULL) {
+ goto ON_ERROR;
+ }
- Session->InitialR2T = (BOOLEAN) (Session->InitialR2T || (AsciiStrCmp (Value, "Yes") == 0));
+ Session->InitialR2T = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);
+ }
//
// ImmediateData, result function is AND.
@@ -1232,7 +1242,7 @@ IScsiCheckOpParams (
goto ON_ERROR;
}
- Session->ImmediateData = (BOOLEAN) (Session->ImmediateData && (AsciiStrCmp (Value, "Yes") == 0));
+ Session->ImmediateData = (BOOLEAN) (Session->ImmediateData && (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0));
//
// MaxRecvDataSegmentLength is declarative.
@@ -1257,13 +1267,15 @@ IScsiCheckOpParams (
// ImmediateData=No.
// This Key/Value is negotiation type.
//
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);
- if (Value == NULL) {
- goto ON_ERROR;
- }
+ if (!(Session->InitialR2T && !Session->ImmediateData)) {
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);
+ if (Value == NULL) {
+ goto ON_ERROR;
+ }
- NumericValue = AsciiStrDecimalToUintn (Value);
- Session->FirstBurstLength = (UINT32) MIN (Session->FirstBurstLength, NumericValue);
+ NumericValue = AsciiStrDecimalToUintn (Value);
+ Session->FirstBurstLength = (UINT32) MIN (Session->FirstBurstLength, NumericValue);
+ }
//
// MaxConnections, result function is Minimum.
@@ -1283,22 +1295,26 @@ IScsiCheckOpParams (
//
// DataPDUInOrder, result function is OR.
//
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);
- if (Value == NULL) {
- goto ON_ERROR;
- }
+ if (!Session->DataPDUInOrder) {
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);
+ if (Value == NULL) {
+ goto ON_ERROR;
+ }
- Session->DataPDUInOrder = (BOOLEAN) (Session->DataPDUInOrder || (AsciiStrCmp (Value, "Yes") == 0));
+ Session->DataPDUInOrder = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);
+ }
//
// DataSequenceInorder, result function is OR.
//
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);
- if (Value == NULL) {
- goto ON_ERROR;
- }
+ if (!Session->DataSequenceInOrder) {
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);
+ if (Value == NULL) {
+ goto ON_ERROR;
+ }
- Session->DataSequenceInOrder = (BOOLEAN) (Session->DataSequenceInOrder || (AsciiStrCmp (Value, "Yes") == 0));
+ Session->DataSequenceInOrder = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);
+ }
//
// DefaultTime2Wait, result function is Maximum.
@@ -1348,11 +1364,24 @@ IScsiCheckOpParams (
Session->MaxOutstandingR2T = (UINT16) MIN (Session->MaxOutstandingR2T, NumericValue);
//
- // Remove declarative key-value paris if any.
+ // Remove declarative key-value pairs, if any.
//
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_SESSION_TYPE);
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_ALIAS);
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_PORTAL_GROUP_TAG);
+ //
+ // Remove the key-value that may not needed for result function is OR.
+ //
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_INITIAL_R2T);
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);
+
+ //
+ // Remove irrelevant parameter, if any.
+ //
+ if (Session->InitialR2T && !Session->ImmediateData) {
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);
+ }
if (IsListEmpty (KeyValueList)) {
//
@@ -1786,7 +1815,7 @@ IScsiNewDataSegment (
@param[in] Packet The EXT SCSI PASS THRU request packet containing the SCSI command.
@param[in] Lun The LUN.
- @param[in] Tcb The tcb assocated with this SCSI command.
+ @param[in] Tcb The tcb associated with this SCSI command.
@return The created iSCSI SCSI command PDU.
@retval NULL Other errors as indicated.
@@ -1837,7 +1866,7 @@ IScsiNewScsiCmdPdu (
if (ScsiCmd == NULL) {
NetbufFree (PduHeader);
return NULL;
- }
+ }
Header = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);
ZeroMem (ScsiCmd, Length);
@@ -2070,6 +2099,7 @@ IScsiGenerateDataOutPduSequence (
NET_BUF *DataOutPdu;
ISCSI_CONNECTION *Conn;
ISCSI_XFER_CONTEXT *XferContext;
+ UINT8 *DataOutPacket;
PduList = AllocatePool (sizeof (LIST_ENTRY));
if (PduList == NULL) {
@@ -2113,7 +2143,14 @@ IScsiGenerateDataOutPduSequence (
//
// Set the F bit for the last data out PDU in this sequence.
//
- ISCSI_SET_FLAG (NetbufGetByte (DataOutPdu, 0, NULL), ISCSI_BHS_FLAG_FINAL);
+ DataOutPacket = NetbufGetByte (DataOutPdu, 0, NULL);
+ if (DataOutPacket == NULL) {
+ IScsiFreeNbufList (PduList);
+ PduList = NULL;
+ goto ON_EXIT;
+ }
+
+ ISCSI_SET_FLAG (DataOutPacket, ISCSI_BHS_FLAG_FINAL);
ON_EXIT:
@@ -2194,6 +2231,9 @@ IScsiOnDataInRcvd (
EFI_STATUS Status;
DataInHdr = (ISCSI_SCSI_DATA_IN *) NetbufGetByte (Pdu, 0, NULL);
+ if (DataInHdr == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
DataInHdr->InitiatorTaskTag = NTOHL (DataInHdr->InitiatorTaskTag);
DataInHdr->ExpCmdSN = NTOHL (DataInHdr->ExpCmdSN);
@@ -2282,6 +2322,9 @@ IScsiOnR2TRcvd (
UINT8 *Data;
R2THdr = (ISCSI_READY_TO_TRANSFER *) NetbufGetByte (Pdu, 0, NULL);
+ if (R2THdr == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
R2THdr->InitiatorTaskTag = NTOHL (R2THdr->InitiatorTaskTag);
R2THdr->TargetTransferTag = NTOHL (R2THdr->TargetTransferTag);
@@ -2345,6 +2388,9 @@ IScsiOnScsiRspRcvd (
UINT32 DataSegLen;
ScsiRspHdr = (SCSI_RESPONSE *) NetbufGetByte (Pdu, 0, NULL);
+ if (ScsiRspHdr == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
ScsiRspHdr->InitiatorTaskTag = NTOHL (ScsiRspHdr->InitiatorTaskTag);
if (ScsiRspHdr->InitiatorTaskTag != Tcb->InitiatorTaskTag) {
@@ -2407,6 +2453,9 @@ IScsiOnScsiRspRcvd (
DataSegLen = ISCSI_GET_DATASEG_LEN (ScsiRspHdr);
if (DataSegLen != 0) {
SenseData = (ISCSI_SENSE_DATA *) NetbufGetByte (Pdu, sizeof (SCSI_RESPONSE), NULL);
+ if (SenseData == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
SenseData->Length = NTOHS (SenseData->Length);
@@ -2441,6 +2490,9 @@ IScsiOnNopInRcvd (
EFI_STATUS Status;
NopInHdr = (ISCSI_NOP_IN *) NetbufGetByte (Pdu, 0, NULL);
+ if (NopInHdr == NULL) {
+ return EFI_PROTOCOL_ERROR;
+ }
NopInHdr->StatSN = NTOHL (NopInHdr->StatSN);
NopInHdr->ExpCmdSN = NTOHL (NopInHdr->ExpCmdSN);
@@ -2470,11 +2522,12 @@ IScsiOnNopInRcvd (
@param[in] Lun The LUN.
@param[in, out] Packet The request packet containing IO request, SCSI command
buffer and buffers to read/write.
-
- @retval EFI_SUCCES The SCSI command is executed and the result is updated to
+
+ @retval EFI_SUCCES The SCSI command is executed and the result is updated to
the Packet.
@retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
+ @retval EFI_NOT_READY The target can not accept new commands.
@retval Others Other errors as indicated.
**/
EFI_STATUS
@@ -2496,7 +2549,7 @@ IScsiExecuteScsiCommand (
UINT8 *Data;
ISCSI_IN_BUFFER_CONTEXT InBufferContext;
UINT64 Timeout;
- UINT8 *Buffer;
+ UINT8 *PduHdr;
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);
Session = &Private->Session;
@@ -2506,7 +2559,8 @@ IScsiExecuteScsiCommand (
Timeout = 0;
if (Session->State != SESSION_STATE_LOGGED_IN) {
- return EFI_DEVICE_ERROR;
+ Status = EFI_DEVICE_ERROR;
+ goto ON_EXIT;
}
Conn = NET_LIST_USER_STRUCT_S (
@@ -2534,8 +2588,13 @@ IScsiExecuteScsiCommand (
}
XferContext = &Tcb->XferContext;
- Buffer = NetbufGetByte (Pdu, 0, NULL);
- XferContext->Offset = ISCSI_GET_DATASEG_LEN (Buffer);
+ PduHdr = NetbufGetByte (Pdu, 0, NULL);
+ if (PduHdr == NULL) {
+ Status = EFI_PROTOCOL_ERROR;
+ NetbufFree (Pdu);
+ goto ON_EXIT;
+ }
+ XferContext->Offset = ISCSI_GET_DATASEG_LEN (PduHdr);
//
// Transmit the SCSI Command PDU.
@@ -2581,7 +2640,7 @@ IScsiExecuteScsiCommand (
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
- TimeoutEvent = Conn->TimeoutEvent;
+ TimeoutEvent = Conn->TimeoutEvent;
}
//
// try to receive PDU from target.
@@ -2591,7 +2650,13 @@ IScsiExecuteScsiCommand (
goto ON_EXIT;
}
- switch (ISCSI_GET_OPCODE (NetbufGetByte (Pdu, 0, NULL))) {
+ PduHdr = NetbufGetByte (Pdu, 0, NULL);
+ if (PduHdr == NULL) {
+ Status = EFI_PROTOCOL_ERROR;
+ NetbufFree (Pdu);
+ goto ON_EXIT;
+ }
+ switch (ISCSI_GET_OPCODE (PduHdr)) {
case ISCSI_OPCODE_SCSI_DATA_IN:
Status = IScsiOnDataInRcvd (Pdu, Tcb, Packet);
break;
@@ -2638,15 +2703,6 @@ ON_EXIT:
IScsiDelTcb (Tcb);
}
- if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_READY)) {
- //
- // Reinstate the session.
- //
- if (EFI_ERROR (IScsiSessionReinstatement (Private))) {
- Status = EFI_DEVICE_ERROR;
- }
- }
-
return Status;
}
@@ -2667,7 +2723,7 @@ IScsiSessionReinstatement (
EFI_STATUS Status;
Session = &Private->Session;
- ASSERT (Session->State == SESSION_STATE_LOGGED_IN);
+ ASSERT (Session->State != SESSION_STATE_FREE);
//
// Abort the session and re-init it.