After the expression,
'CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);',
the '\0' should be set to TargetUrl[Field->Len] rather than
TargetUrl[Field->Len + 1].
Besides the boundary check should be more strict.
Field->Len should range from 0-254 rather than 0-255.

Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiDhcp.c  | 7 ++++---
 NetworkPkg/IScsiDxe/IScsiDhcp6.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp.c b/NetworkPkg/IScsiDxe/IScsiDhcp.c
index d8c9fff6c65d..eac5b39991b7 100644
--- a/NetworkPkg/IScsiDxe/IScsiDhcp.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp.c
@@ -122,11 +122,12 @@ IScsiDhcpExtractRootPath (
   //
   if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) != '[')) {
     ConfigNvData->DnsMode = TRUE;
-    if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {
-      return EFI_INVALID_PARAMETER;
+    if (Field->Len >= sizeof (ConfigNvData->TargetUrl) {
+      Status = EFI_INVALID_PARAMETER;
+      goto ON_EXIT;
     }
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);
-    ConfigNvData->TargetUrl[Field->Len + 1] = '\0';
+    ConfigNvData->TargetUrl[Field->Len] = '\0';
   } else {
     ConfigNvData->DnsMode = FALSE;
     ZeroMem(ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl));
diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
index 86a872adeccc..be66e6684a0e 100644
--- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
@@ -161,11 +161,12 @@ IScsiDhcp6ExtractRootPath (
   // Server name is expressed as domain name, just save it.
   //
   if (ConfigNvData->DnsMode) {
-    if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {
-      return EFI_INVALID_PARAMETER;
+    if (Field->Len >= sizeof (ConfigNvData->TargetUrl)) {
+      Status = EFI_INVALID_PARAMETER;
+      goto ON_EXIT;
     }
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);
-    ConfigNvData->TargetUrl[Field->Len + 1] = '\0';
+    ConfigNvData->TargetUrl[Field->Len] = '\0';
   } else {
     ZeroMem(&ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl));
     Status = IScsiAsciiStrToIp (Field->Str, IpMode, &Ip);
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#48876): https://edk2.groups.io/g/devel/message/48876
Mute This Topic: https://groups.io/mt/34529164/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-