NetworkPkg/IScsiDxe: Enhance the check for array boundary

Array 'TargetUrl' of size 255 may use index value(s) 255 and 256.
So enhance the boundary check to ensure the index is valid.

Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp.c b/NetworkPkg/IScsiDxe/IScsiDhcp.c
index 7ce9bf575012b0f1594bd702cf2f4cfe73537dd9..afa8a86cd41982b1bdb26cb46bb0fac135e8dab0 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDhcp.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp.c
@@ -122,7 +122,7 @@ IScsiDhcpExtractRootPath (
   //\r
   if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) != '[')) {\r
     ConfigNvData->DnsMode = TRUE;\r
   //\r
   if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) != '[')) {\r
     ConfigNvData->DnsMode = TRUE;\r

-    if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {\r
+    if ((Field->Len + 2) > sizeof (ConfigNvData->TargetUrl)) {\r

       return EFI_INVALID_PARAMETER;\r
     }\r
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);\r

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
index 86a872adeccc89edbde78e5a41ac46d4e68582c5..691650b7334fdd70883c0c18cfea08d7cb6e12c1 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
@@ -161,7 +161,7 @@ IScsiDhcp6ExtractRootPath (
   // Server name is expressed as domain name, just save it.\r
   //\r
   if (ConfigNvData->DnsMode) {\r
   // Server name is expressed as domain name, just save it.\r
   //\r
   if (ConfigNvData->DnsMode) {\r

-    if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {\r
+    if ((Field->Len + 2) > sizeof (ConfigNvData->TargetUrl)) {\r

       return EFI_INVALID_PARAMETER;\r
     }\r
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);\r