Fix issue that iscsi initiator name with 223 bytes can not be saved.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiConfig.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 9155864e4c167ea7dbaf7fafdb4f098076c06993..fa8f202b6a2ac81f93f98fe8f9e2a4afc73b460b 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -473,7 +473,7 @@ IScsiFormExtractConfig (
   )\r
 {\r
   EFI_STATUS                       Status;\r
-  CHAR8                            InitiatorName[ISCSI_NAME_IFR_MAX_SIZE];\r
+  CHAR8                            InitiatorName[ISCSI_NAME_MAX_SIZE];\r
   UINTN                            BufferSize;\r
   ISCSI_CONFIG_IFR_NVDATA          *IfrNvData;\r
   ISCSI_FORM_CALLBACK_INFO         *Private;\r
@@ -512,7 +512,7 @@ IScsiFormExtractConfig (
     IScsiConvertDeviceConfigDataToIfrNvData (Private->Current, IfrNvData);\r
   }\r
 \r
-  BufferSize  = ISCSI_NAME_IFR_MAX_SIZE;\r
+  BufferSize  = ISCSI_NAME_MAX_SIZE;\r
   Status      = gIScsiInitiatorName.Get (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
   if (EFI_ERROR (Status)) {\r
     IfrNvData->InitiatorName[0] = L'\0';\r
@@ -666,7 +666,7 @@ IScsiFormCallback (
 {\r
   ISCSI_FORM_CALLBACK_INFO  *Private;\r
   UINTN                     BufferSize;\r
-  CHAR8                     IScsiName[ISCSI_NAME_IFR_MAX_SIZE];\r
+  CHAR8                     IScsiName[ISCSI_NAME_MAX_SIZE];\r
   CHAR16                    PortString[128];\r
   CHAR8                     Ip4String[IP4_STR_MAX_SIZE];\r
   CHAR8                     LunString[ISCSI_LUN_STR_MAX_LEN];\r
@@ -704,7 +704,7 @@ IScsiFormCallback (
   switch (QuestionId) {\r
   case KEY_INITIATOR_NAME:\r
     IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);\r
-    BufferSize  = AsciiStrLen (IScsiName) + 1;\r
+    BufferSize  = AsciiStrSize (IScsiName);\r
 \r
     Status      = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
     if (EFI_ERROR (Status)) {\r