/** @file\r
The implementation of iSCSI protocol based on RFC3720.\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
&Conn->TimeoutEvent\r
);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (Conn);\r
+ FreePool (Conn);\r
return NULL;\r
}\r
\r
// set the default connection-only parameters\r
//\r
Conn->MaxRecvDataSegmentLength = DEFAULT_MAX_RECV_DATA_SEG_LEN;\r
- Conn->HeaderDigest = ISCSI_DIGEST_NONE;\r
- Conn->DataDigest = ISCSI_DIGEST_NONE;\r
+ Conn->HeaderDigest = IScsiDigestNone;\r
+ Conn->DataDigest = IScsiDigestNone;\r
\r
CopyMem (&Tcp4IoConfig.LocalIp, &Session->ConfigData.NvData.LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (&Tcp4IoConfig.SubnetMask, &Session->ConfigData.NvData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
);\r
if (EFI_ERROR (Status)) {\r
gBS->CloseEvent (Conn->TimeoutEvent);\r
- gBS->FreePool (Conn);\r
+ FreePool (Conn);\r
Conn = NULL;\r
}\r
\r
Tcp4IoDestroySocket (&Conn->Tcp4Io);\r
NetbufQueFlush (&Conn->RspQue);\r
gBS->CloseEvent (Conn->TimeoutEvent);\r
- gBS->FreePool (Conn);\r
+ FreePool (Conn);\r
}\r
\r
/**\r
\r
@retval EFI_SUCCESS The iSCSI session login procedure finished.\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
+ @retval EFI_NO_MEDIA There was a media error.\r
@retval Others Other errors as indicated.\r
+\r
**/\r
EFI_STATUS\r
IScsiSessionLogin (\r
ISCSI_SESSION *Session;\r
ISCSI_CONNECTION *Conn;\r
EFI_TCP4_PROTOCOL *Tcp4;\r
+ BOOLEAN MediaPresent;\r
\r
Session = &Private->Session;\r
\r
+ //\r
+ // Check media status before session login\r
+ //\r
+ MediaPresent = TRUE;\r
+ NetLibDetectMedia (Private->Controller, &MediaPresent);\r
+ if (!MediaPresent) {\r
+ return EFI_NO_MEDIA;\r
+ }\r
+\r
+ //\r
+ // Set session identifier\r
+ //\r
+ CopyMem (Session->Isid, Session->ConfigData.NvData.IsId, 6);\r
+\r
//\r
// Create a connection for the session.\r
//\r
EFI_STATUS Status;\r
NET_BUF *Pdu;\r
\r
+ Pdu = NULL;\r
+\r
//\r
// Receive the iSCSI login response.\r
//\r
//\r
// A Login Response is received, process it.\r
//\r
+ ASSERT (Pdu != NULL);\r
Status = IScsiProcessLoginRsp (Conn, Pdu);\r
\r
NetbufFree (Pdu);\r
CHAR8 *Data;\r
\r
LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, NULL);\r
+ if (LoginReq == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
DataSegLen = NTOH24 (LoginReq->DataSegmentLength);\r
\r
KeyLen = (UINT32) AsciiStrLen (Key);\r
Session = Conn->Session;\r
\r
LoginRsp = (ISCSI_LOGIN_RESPONSE *) NetbufGetByte (Pdu, 0, NULL);\r
+ if (LoginRsp == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
if (!ISCSI_CHECK_OPCODE (LoginRsp, ISCSI_OPCODE_LOGIN_RSP)) {\r
//\r
// It's not a Login Response\r
LoginRsp->MaxCmdSN = NTOHL (LoginRsp->MaxCmdSN);\r
\r
if ((Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION) && (Conn->CHAPStep == ISCSI_CHAP_INITIAL)) {\r
+ //\r
+ // If the Login Request is a leading Login Request, the target MUST use\r
+ // the value presented in CmdSN as the target value for ExpCmdSN.\r
+ //\r
+ if ((Session->State == SESSION_STATE_FREE) && (Session->CmdSN != LoginRsp->ExpCmdSN)) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
+\r
//\r
// It's the initial Login Response, initialize the local ExpStatSN, MaxCmdSN\r
// and ExpCmdSN.\r
@param[in] Arg The opaque parameter.\r
**/\r
VOID\r
+EFIAPI\r
IScsiFreeNbufList (\r
VOID *Arg\r
)\r
ASSERT (Arg != NULL);\r
\r
NetbufFreeList ((LIST_ENTRY *) Arg);\r
- gBS->FreePool (Arg);\r
+ FreePool (Arg);\r
}\r
\r
/**\r
@param[in] Arg The opaque parameter.\r
**/\r
VOID\r
+EFIAPI\r
IScsiNbufExtFree (\r
VOID *Arg\r
)\r
Len = sizeof (ISCSI_BASIC_HEADER) + (HeaderDigest ? sizeof (UINT32) : 0);\r
PduHdr = NetbufAlloc (Len);\r
if (PduHdr == NULL) {\r
- gBS->FreePool (NbufList);\r
+ FreePool (NbufList);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
//\r
KeyValueList = IScsiBuildKeyValueList (Data, Len);\r
if (KeyValueList == NULL) {\r
- gBS->FreePool (Data);\r
+ FreePool (Data);\r
return Status;\r
}\r
//\r
}\r
\r
if (AsciiStrCmp (Value, "CRC32") == 0) {\r
- if (Conn->HeaderDigest != ISCSI_DIGEST_CRC32) {\r
+ if (Conn->HeaderDigest != IScsiDigestCRC32) {\r
goto ON_ERROR;\r
}\r
} else if (AsciiStrCmp (Value, ISCSI_KEY_VALUE_NONE) == 0) {\r
- Conn->HeaderDigest = ISCSI_DIGEST_NONE;\r
+ Conn->HeaderDigest = IScsiDigestNone;\r
} else {\r
goto ON_ERROR;\r
}\r
}\r
\r
if (AsciiStrCmp (Value, "CRC32") == 0) {\r
- if (Conn->DataDigest != ISCSI_DIGEST_CRC32) {\r
+ if (Conn->DataDigest != IScsiDigestCRC32) {\r
goto ON_ERROR;\r
}\r
} else if (AsciiStrCmp (Value, ISCSI_KEY_VALUE_NONE) == 0) {\r
- Conn->DataDigest = ISCSI_DIGEST_NONE;\r
+ Conn->DataDigest = IScsiDigestNone;\r
} else {\r
goto ON_ERROR;\r
}\r
//\r
// InitialR2T, result function is OR.\r
//\r
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_INITIAL_R2T);\r
- if (Value == NULL) {\r
- goto ON_ERROR;\r
- }\r
+ if (!Session->InitialR2T) {\r
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_INITIAL_R2T);\r
+ if (Value == NULL) {\r
+ goto ON_ERROR;\r
+ }\r
\r
- Session->InitialR2T = (BOOLEAN) (Session->InitialR2T || (AsciiStrCmp (Value, "Yes") == 0));\r
+ Session->InitialR2T = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+ }\r
\r
//\r
// ImmediateData, result function is AND.\r
goto ON_ERROR;\r
}\r
\r
- Session->ImmediateData = (BOOLEAN) (Session->ImmediateData && (AsciiStrCmp (Value, "Yes") == 0));\r
+ Session->ImmediateData = (BOOLEAN) (Session->ImmediateData && (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0));\r
\r
//\r
// MaxRecvDataSegmentLength is declarative.\r
// ImmediateData=No.\r
// This Key/Value is negotiation type.\r
//\r
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);\r
- if (Value == NULL) {\r
- goto ON_ERROR;\r
- }\r
+ if (!(Session->InitialR2T && !Session->ImmediateData)) {\r
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);\r
+ if (Value == NULL) {\r
+ goto ON_ERROR;\r
+ }\r
\r
- NumericValue = AsciiStrDecimalToUintn (Value);\r
- Session->FirstBurstLength = (UINT32) MIN (Session->FirstBurstLength, NumericValue);\r
+ NumericValue = AsciiStrDecimalToUintn (Value);\r
+ Session->FirstBurstLength = (UINT32) MIN (Session->FirstBurstLength, NumericValue);\r
+ }\r
\r
//\r
// MaxConnections, result function is Minimum.\r
//\r
// DataPDUInOrder, result function is OR.\r
//\r
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);\r
- if (Value == NULL) {\r
- goto ON_ERROR;\r
- }\r
+ if (!Session->DataPDUInOrder) {\r
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);\r
+ if (Value == NULL) {\r
+ goto ON_ERROR;\r
+ }\r
\r
- Session->DataPDUInOrder = (BOOLEAN) (Session->DataPDUInOrder || (AsciiStrCmp (Value, "Yes") == 0));\r
+ Session->DataPDUInOrder = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+ }\r
\r
//\r
// DataSequenceInorder, result function is OR.\r
//\r
- Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);\r
- if (Value == NULL) {\r
- goto ON_ERROR;\r
- }\r
+ if (!Session->DataSequenceInOrder) {\r
+ Value = IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);\r
+ if (Value == NULL) {\r
+ goto ON_ERROR;\r
+ }\r
\r
- Session->DataSequenceInOrder = (BOOLEAN) (Session->DataSequenceInOrder || (AsciiStrCmp (Value, "Yes") == 0));\r
+ Session->DataSequenceInOrder = (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+ }\r
\r
//\r
// DefaultTime2Wait, result function is Maximum.\r
Session->MaxOutstandingR2T = (UINT16) MIN (Session->MaxOutstandingR2T, NumericValue);\r
\r
//\r
- // Remove declarative key-value paris if any.\r
+ // Remove declarative key-value pairs, if any.\r
//\r
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_SESSION_TYPE);\r
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_ALIAS);\r
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_PORTAL_GROUP_TAG);\r
+ //\r
+ // Remove the key-value that may not needed for result function is OR.\r
+ //\r
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_INITIAL_R2T);\r
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);\r
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);\r
+\r
+ //\r
+ // Remove irrelevant parameter, if any.\r
+ //\r
+ if (Session->InitialR2T && !Session->ImmediateData) {\r
+ IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);\r
+ }\r
\r
if (IsListEmpty (KeyValueList)) {\r
//\r
\r
IScsiFreeKeyValueList (KeyValueList);\r
\r
- gBS->FreePool (Data);\r
+ FreePool (Data);\r
\r
return Status;\r
}\r
\r
Session = Conn->Session;\r
\r
- AsciiSPrint (Value, sizeof (Value), "%a", (Conn->HeaderDigest == ISCSI_DIGEST_CRC32) ? "None,CRC32" : "None");\r
+ AsciiSPrint (Value, sizeof (Value), "%a", (Conn->HeaderDigest == IScsiDigestCRC32) ? "None,CRC32" : "None");\r
IScsiAddKeyValuePair (Pdu, ISCSI_KEY_HEADER_DIGEST, Value);\r
\r
- AsciiSPrint (Value, sizeof (Value), "%a", (Conn->DataDigest == ISCSI_DIGEST_CRC32) ? "None,CRC32" : "None");\r
+ AsciiSPrint (Value, sizeof (Value), "%a", (Conn->DataDigest == IScsiDigestCRC32) ? "None,CRC32" : "None");\r
IScsiAddKeyValuePair (Pdu, ISCSI_KEY_DATA_DIGEST, Value);\r
\r
AsciiSPrint (Value, sizeof (Value), "%d", Session->ErrorRecoveryLevel);\r
Data++;\r
Len--;\r
} else {\r
- gBS->FreePool (KeyValuePair);\r
+ FreePool (KeyValuePair);\r
goto ON_ERROR;\r
}\r
\r
Value = KeyValuePair->Value;\r
\r
RemoveEntryList (&KeyValuePair->List);\r
- gBS->FreePool (KeyValuePair);\r
+ FreePool (KeyValuePair);\r
break;\r
}\r
}\r
Entry = NetListRemoveHead (KeyValueList);\r
KeyValuePair = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);\r
\r
- gBS->FreePool (KeyValuePair);\r
+ FreePool (KeyValuePair);\r
}\r
\r
- gBS->FreePool (KeyValueList);\r
+ FreePool (KeyValueList);\r
}\r
\r
/**\r
{\r
RemoveEntryList (&Tcb->Link);\r
\r
- gBS->FreePool (Tcb);\r
+ FreePool (Tcb);\r
}\r
\r
/**\r
ScsiCmd->CmdSN = NTOHL (Tcb->CmdSN);\r
ScsiCmd->ExpStatSN = NTOHL (Tcb->Conn->ExpStatSN);\r
\r
- CopyMem (ScsiCmd->CDB, Packet->Cdb, sizeof (ScsiCmd->CDB));\r
+ CopyMem (ScsiCmd->Cdb, Packet->Cdb, sizeof (ScsiCmd->Cdb));\r
\r
if (Packet->CdbLength > 16) {\r
- Header->Length = NTOHS (Packet->CdbLength - 15);\r
+ Header->Length = NTOHS ((UINT16) (Packet->CdbLength - 15));\r
Header->Type = ISCSI_AHS_TYPE_EXT_CDB;\r
\r
CopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);\r
//\r
PduHdr = NetbufAlloc (sizeof (ISCSI_SCSI_DATA_OUT));\r
if (PduHdr == NULL) {\r
- gBS->FreePool (NbufList);\r
+ FreePool (NbufList);\r
return NULL;\r
}\r
//\r
NET_BUF *DataOutPdu;\r
ISCSI_CONNECTION *Conn;\r
ISCSI_XFER_CONTEXT *XferContext;\r
+ UINT8 *DataOutPacket;\r
\r
PduList = AllocatePool (sizeof (LIST_ENTRY));\r
if (PduList == NULL) {\r
//\r
// Set the F bit for the last data out PDU in this sequence.\r
//\r
- ISCSI_SET_FLAG (NetbufGetByte (DataOutPdu, 0, NULL), ISCSI_BHS_FLAG_FINAL);\r
+ DataOutPacket = NetbufGetByte (DataOutPdu, 0, NULL);\r
+ if (DataOutPacket == NULL) {\r
+ IScsiFreeNbufList (PduList);\r
+ PduList = NULL;\r
+ goto ON_EXIT;\r
+ }\r
+\r
+ ISCSI_SET_FLAG (DataOutPacket, ISCSI_BHS_FLAG_FINAL);\r
\r
ON_EXIT:\r
\r
EFI_STATUS Status;\r
\r
DataInHdr = (ISCSI_SCSI_DATA_IN *) NetbufGetByte (Pdu, 0, NULL);\r
+ if (DataInHdr == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
\r
DataInHdr->InitiatorTaskTag = NTOHL (DataInHdr->InitiatorTaskTag);\r
DataInHdr->ExpCmdSN = NTOHL (DataInHdr->ExpCmdSN);\r
UINT8 *Data;\r
\r
R2THdr = (ISCSI_READY_TO_TRANSFER *) NetbufGetByte (Pdu, 0, NULL);\r
+ if (R2THdr == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
\r
R2THdr->InitiatorTaskTag = NTOHL (R2THdr->InitiatorTaskTag);\r
R2THdr->TargetTransferTag = NTOHL (R2THdr->TargetTransferTag);\r
R2THdr->StatSN = NTOHL (R2THdr->StatSN);\r
- R2THdr->R2TSN = NTOHL (R2THdr->R2TSN);\r
+ R2THdr->R2TSeqNum = NTOHL (R2THdr->R2TSeqNum);\r
R2THdr->BufferOffset = NTOHL (R2THdr->BufferOffset);\r
R2THdr->DesiredDataTransferLength = NTOHL (R2THdr->DesiredDataTransferLength);\r
\r
//\r
// Check the sequence number.\r
//\r
- Status = IScsiCheckSN (&Tcb->ExpDataSN, R2THdr->R2TSN);\r
+ Status = IScsiCheckSN (&Tcb->ExpDataSN, R2THdr->R2TSeqNum);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
UINT32 DataSegLen;\r
\r
ScsiRspHdr = (SCSI_RESPONSE *) NetbufGetByte (Pdu, 0, NULL);\r
+ if (ScsiRspHdr == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
\r
ScsiRspHdr->InitiatorTaskTag = NTOHL (ScsiRspHdr->InitiatorTaskTag);\r
if (ScsiRspHdr->InitiatorTaskTag != Tcb->InitiatorTaskTag) {\r
DataSegLen = ISCSI_GET_DATASEG_LEN (ScsiRspHdr);\r
if (DataSegLen != 0) {\r
SenseData = (ISCSI_SENSE_DATA *) NetbufGetByte (Pdu, sizeof (SCSI_RESPONSE), NULL);\r
+ if (SenseData == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
\r
SenseData->Length = NTOHS (SenseData->Length);\r
\r
EFI_STATUS Status;\r
\r
NopInHdr = (ISCSI_NOP_IN *) NetbufGetByte (Pdu, 0, NULL);\r
+ if (NopInHdr == NULL) {\r
+ return EFI_PROTOCOL_ERROR;\r
+ }\r
\r
NopInHdr->StatSN = NTOHL (NopInHdr->StatSN);\r
NopInHdr->ExpCmdSN = NTOHL (NopInHdr->ExpCmdSN);\r
the Packet.\r
@retval EFI_DEVICE_ERROR Session state was not as required.\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
+ @retval EFI_NOT_READY The target can not accept new commands.\r
@retval Others Other errors as indicated.\r
**/\r
EFI_STATUS\r
UINT8 *Data;\r
ISCSI_IN_BUFFER_CONTEXT InBufferContext;\r
UINT64 Timeout;\r
- UINT8 *Buffer;\r
+ UINT8 *PduHdr;\r
\r
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);\r
Session = &Private->Session;\r
Timeout = 0;\r
\r
if (Session->State != SESSION_STATE_LOGGED_IN) {\r
- return EFI_DEVICE_ERROR;\r
+ Status = EFI_DEVICE_ERROR;\r
+ goto ON_EXIT;\r
}\r
\r
Conn = NET_LIST_USER_STRUCT_S (\r
}\r
\r
XferContext = &Tcb->XferContext;\r
- Buffer = NetbufGetByte (Pdu, 0, NULL);\r
- XferContext->Offset = ISCSI_GET_DATASEG_LEN (Buffer);\r
+ PduHdr = NetbufGetByte (Pdu, 0, NULL);\r
+ if (PduHdr == NULL) {\r
+ Status = EFI_PROTOCOL_ERROR;\r
+ NetbufFree (Pdu);\r
+ goto ON_EXIT;\r
+ }\r
+ XferContext->Offset = ISCSI_GET_DATASEG_LEN (PduHdr);\r
\r
//\r
// Transmit the SCSI Command PDU.\r
goto ON_EXIT;\r
}\r
\r
- switch (ISCSI_GET_OPCODE (NetbufGetByte (Pdu, 0, NULL))) {\r
+ PduHdr = NetbufGetByte (Pdu, 0, NULL);\r
+ if (PduHdr == NULL) {\r
+ Status = EFI_PROTOCOL_ERROR;\r
+ NetbufFree (Pdu);\r
+ goto ON_EXIT;\r
+ }\r
+ switch (ISCSI_GET_OPCODE (PduHdr)) {\r
case ISCSI_OPCODE_SCSI_DATA_IN:\r
Status = IScsiOnDataInRcvd (Pdu, Tcb, Packet);\r
break;\r
IScsiDelTcb (Tcb);\r
}\r
\r
- if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_READY)) {\r
- //\r
- // Reinstate the session.\r
- //\r
- if (EFI_ERROR (IScsiSessionReinstatement (Private))) {\r
- Status = EFI_DEVICE_ERROR;\r
- }\r
- }\r
-\r
return Status;\r
}\r
\r
EFI_STATUS Status;\r
\r
Session = &Private->Session;\r
- ASSERT (Session->State == SESSION_STATE_LOGGED_IN);\r
+ ASSERT (Session->State != SESSION_STATE_FREE);\r
\r
//\r
// Abort the session and re-init it.\r
IN BOOLEAN Recovery\r
)\r
{\r
- UINT32 Random;\r
-\r
if (!Recovery) {\r
Session->Signature = ISCSI_SESSION_SIGNATURE;\r
Session->State = SESSION_STATE_FREE;\r
\r
- Random = NET_RANDOM (NetRandomInitSeed ());\r
-\r
- Session->Isid[0] = ISID_BYTE_0;\r
- Session->Isid[1] = ISID_BYTE_1;\r
- Session->Isid[2] = ISID_BYTE_2;\r
- Session->Isid[3] = ISID_BYTE_3;\r
- Session->Isid[4] = (UINT8) Random;\r
- Session->Isid[5] = (UINT8) (Random >> 8);\r
-\r
InitializeListHead (&Session->Conns);\r
InitializeListHead (&Session->TcbList);\r
}\r