NetworkPkg: Add check logic for iSCSI driver.

Need to check variable of mPrivate whether is
null before used and redefine the array length
of target address for keyword.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 56a8685c2c020c480a6eaa46ebfc46a316077ce9..a588403017355547b8ce0d61830a456e3a2802af 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -744,24 +744,24 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
       }\r
     }\r
     CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
-  }\r
 \r
-  NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
-    NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
-    IScsiMacAddrToStr (\r
-    &NicInfo->PermanentAddress,\r
-    NicInfo->HwAddressSize,\r
-    NicInfo->VlanId,\r
-    MacString\r
-    );\r
-    CopyMem (\r
-      IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),\r
-      MacString,\r
-      StrLen (MacString) * sizeof (CHAR16)\r
+    NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
+      NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
+      IScsiMacAddrToStr (\r
+      &NicInfo->PermanentAddress,\r
+      NicInfo->HwAddressSize,\r
+      NicInfo->VlanId,\r
+      MacString\r
       );\r
+      CopyMem (\r
+        IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),\r
+        MacString,\r
+        StrLen (MacString) * sizeof (CHAR16)\r
+        );\r
 \r
-    *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';\r
-   }\r
+      *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';\r
+     } \r
+  }\r
 }\r
 \r
 /**\r

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
index f89f3208547dbf4b8586f5bcec6593b6aae59108..22119ad338c0bf6a2ed7c3bb291a42909ecf941d 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -162,7 +162,7 @@ typedef struct {
   CHAR16  ISCSIInitiatorNetmask[IP4_STR_MAX_SIZE];\r
   CHAR16  ISCSIInitiatorGateway[IP4_STR_MAX_SIZE];\r
   CHAR16  ISCSITargetName[ISCSI_NAME_MAX_SIZE];\r
-  CHAR16  ISCSITargetIpAddress[IP_STR_MAX_SIZE];\r
+  CHAR16  ISCSITargetIpAddress[ISCSI_TARGET_URI_MAX_SIZE];\r
   CHAR16  ISCSILun[ISCSI_LUN_STR_MAX_LEN];\r
   CHAR16  ISCSIChapUsername[ISCSI_CHAP_NAME_STORAGE];\r
   CHAR16  ISCSIChapSecret[ISCSI_CHAP_SECRET_STORAGE];\r