4 files changed, 26 insertions, 5 deletions
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
index 59d514fe1..f6a64e56d 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
@@ -41,9 +41,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 typedef struct _ISCSI_CHAP_AUTH_CONFIG_NVDATA {
   UINT8 CHAPType;
-  CHAR8 CHAPName[ISCSI_CHAP_NAME_MAX_LEN];
+  CHAR8 CHAPName[ISCSI_CHAP_NAME_STORAGE];
   CHAR8 CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
-  CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];
+  CHAR8 ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];
   CHAR8 ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
 } ISCSI_CHAP_AUTH_CONFIG_NVDATA;
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index 85ad3d173..7c2e4e65f 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -73,6 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define ISCSI_CHAP_SECRET_STORAGE 17
 
 #define ISCSI_CHAP_NAME_MAX_LEN   126
+#define ISCSI_CHAP_NAME_STORAGE   127
 
 #define ISID_CONFIGURABLE_MIN_LEN 6
 #define ISID_CONFIGURABLE_MAX_LEN 12
@@ -96,9 +97,9 @@ typedef struct {
   UINT8   TargetInfoFromDhcp;
 
   UINT8   CHAPType;
-  CHAR16  CHAPName[ISCSI_CHAP_NAME_MAX_LEN];
+  CHAR16  CHAPName[ISCSI_CHAP_NAME_STORAGE];
   CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
-  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];
+  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];
   CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];
 
   CHAR16  IsId[ISID_CONFIGURABLE_STORAGE];
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 840692b45..5341e5a01 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -757,7 +757,19 @@ IScsiGetTcpConnDevicePath (
         ) {
 
       DPathNode->Ipv4.LocalPort       = 0;
-      DPathNode->Ipv4.StaticIpAddress = (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
+      DPathNode->Ipv4.StaticIpAddress = 
+        (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
+
+      IP4_COPY_ADDRESS (
+        &DPathNode->Ipv4.GatewayIpAddress,
+        &Session->ConfigData.NvData.Gateway
+        );
+
+      IP4_COPY_ADDRESS (
+        &DPathNode->Ipv4.SubnetMask,
+        &Session->ConfigData.NvData.SubnetMask
+        );
+
       break;
     }
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 3836053d9..331f9d8d2 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -693,6 +693,14 @@ IScsiProcessLoginRsp (
 
   if ((Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION) && (Conn->CHAPStep == ISCSI_CHAP_INITIAL)) {
     //
+    // If the Login Request is a leading Login Request, the target MUST use
+    // the value presented in CmdSN as the target value for ExpCmdSN.
+    //
+    if ((Session->State == SESSION_STATE_FREE) && (Session->CmdSN != LoginRsp->ExpCmdSN)) {
+      return EFI_PROTOCOL_ERROR;
+    }
+
+    //
     // It's the initial Login Response, initialize the local ExpStatSN, MaxCmdSN
     // and ExpCmdSN.
     //