1. Patchew
  2. EDK2
  3. View series

[edk2] [patch] NetworkPkg: Fix bug in iSCSI mode ipv6 when enabling target DHCP.

Zhang Lubo posted 1 patch 7 years, 6 months ago
Failed in applying to current master (apply log)
NetworkPkg/IScsiDxe/IScsiDhcp6.c | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
[edk2] [patch] NetworkPkg: Fix bug in iSCSI mode ipv6 when enabling target DHCP.
Posted by Zhang Lubo 7 years, 6 months ago 
if the server name expressed as a site local address begain with FEC0
when retrieving from dhcpv6 option 59 boot file url, it incorrectly process it
as a dns name.

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>
---
 NetworkPkg/IScsiDxe/IScsiDhcp6.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
index d3535d5..06c634c 100644
--- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
@@ -48,11 +48,11 @@ IScsiDhcp6ExtractRootPath (
   ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;
   EFI_IP_ADDRESS              Ip;
   UINT8                       IpMode;  
 
   ConfigNvData = &ConfigData->SessionConfigData;
-
+  ConfigNvData->DnsMode = FALSE;
   //
   // "iscsi:"<servername>":"<protocol>":"<port>":"<LUN>":"<targetname>
   //
   IScsiRootPathIdLen = (UINT16) AsciiStrLen (ISCSI_ROOT_PATH_ID);
 
@@ -80,27 +80,40 @@ IScsiDhcp6ExtractRootPath (
 
   //
   // Extract SERVERNAME field in the Root Path option.
   //
   if (TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_START_DELIMITER) {
-    Status = EFI_INVALID_PARAMETER;
-    goto ON_EXIT;
+    //
+    // The servername is expressed as domain name.
+    //
+    ConfigNvData->DnsMode = TRUE;
   } else {
     Index++;
   }
 
   Fields[RP_FIELD_IDX_SERVERNAME].Str = &TmpStr[Index];
 
-  while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER) && (Index < Length)) {
-    Index++;
-  }
+  if (!ConfigNvData->DnsMode) {
+    while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER)&& (Index < Length)) {
+      Index++;
+    }
 
-  //
-  // Skip ']' and ':'.
-  //
-  TmpStr[Index] = '\0';
-  Index += 2;
+    //
+    // Skip ']' and ':'.
+    //
+    TmpStr[Index] = '\0';
+    Index += 2;
+  } else {
+    while ((TmpStr[Index] != ISCSI_ROOT_PATH_FIELD_DELIMITER) && (Index < Length)) {
+      Index++;
+    }
+    //
+    // Skip ':'.
+    //
+    TmpStr[Index] = '\0';
+    Index += 1;
+  }
 
   Fields[RP_FIELD_IDX_SERVERNAME].Len = (UINT8) AsciiStrLen (Fields[RP_FIELD_IDX_SERVERNAME].Str);
 
   //
   // Extract others fields in the Root Path option string.
@@ -151,12 +164,11 @@ IScsiDhcp6ExtractRootPath (
   }
 
   //
   // Server name is expressed as domain name, just save it.
   //
-  if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) != '[')) {
-    ConfigNvData->DnsMode = TRUE;
+  if (ConfigNvData->DnsMode) {
     if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {
       return EFI_INVALID_PARAMETER;
     }
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);
     ConfigNvData->TargetUrl[Field->Len + 1] = '\0';
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [patch] NetworkPkg: Fix bug in iSCSI mode ipv6 when enabling target DHCP.
Posted by Wu, Jiaxin 7 years, 6 months ago 
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>

Thanks,
Jiaxin

> -----Original Message-----
> From: Zhang, Lubo
> Sent: Friday, April 28, 2017 2:40 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Ye, Ting <ting.ye@intel.com>; Fu, Siyuan
> <siyuan.fu@intel.com>
> Subject: [patch] NetworkPkg: Fix bug in iSCSI mode ipv6 when enabling target
> DHCP.
> 
> if the server name expressed as a site local address begain with FEC0
> when retrieving from dhcpv6 option 59 boot file url, it incorrectly process it
> as a dns name.
> 
> 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>
> ---
>  NetworkPkg/IScsiDxe/IScsiDhcp6.c | 38 +++++++++++++++++++++++++-----------
> --
>  1 file changed, 25 insertions(+), 13 deletions(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> index d3535d5..06c634c 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> +++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> @@ -48,11 +48,11 @@ IScsiDhcp6ExtractRootPath (
>    ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;
>    EFI_IP_ADDRESS              Ip;
>    UINT8                       IpMode;
> 
>    ConfigNvData = &ConfigData->SessionConfigData;
> -
> +  ConfigNvData->DnsMode = FALSE;
>    //
>    // "iscsi:"<servername>":"<protocol>":"<port>":"<LUN>":"<targetname>
>    //
>    IScsiRootPathIdLen = (UINT16) AsciiStrLen (ISCSI_ROOT_PATH_ID);
> 
> @@ -80,27 +80,40 @@ IScsiDhcp6ExtractRootPath (
> 
>    //
>    // Extract SERVERNAME field in the Root Path option.
>    //
>    if (TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_START_DELIMITER) {
> -    Status = EFI_INVALID_PARAMETER;
> -    goto ON_EXIT;
> +    //
> +    // The servername is expressed as domain name.
> +    //
> +    ConfigNvData->DnsMode = TRUE;
>    } else {
>      Index++;
>    }
> 
>    Fields[RP_FIELD_IDX_SERVERNAME].Str = &TmpStr[Index];
> 
> -  while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER) &&
> (Index < Length)) {
> -    Index++;
> -  }
> +  if (!ConfigNvData->DnsMode) {
> +    while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER)&&
> (Index < Length)) {
> +      Index++;
> +    }
> 
> -  //
> -  // Skip ']' and ':'.
> -  //
> -  TmpStr[Index] = '\0';
> -  Index += 2;
> +    //
> +    // Skip ']' and ':'.
> +    //
> +    TmpStr[Index] = '\0';
> +    Index += 2;
> +  } else {
> +    while ((TmpStr[Index] != ISCSI_ROOT_PATH_FIELD_DELIMITER) && (Index <
> Length)) {
> +      Index++;
> +    }
> +    //
> +    // Skip ':'.
> +    //
> +    TmpStr[Index] = '\0';
> +    Index += 1;
> +  }
> 
>    Fields[RP_FIELD_IDX_SERVERNAME].Len = (UINT8) AsciiStrLen
> (Fields[RP_FIELD_IDX_SERVERNAME].Str);
> 
>    //
>    // Extract others fields in the Root Path option string.
> @@ -151,12 +164,11 @@ IScsiDhcp6ExtractRootPath (
>    }
> 
>    //
>    // Server name is expressed as domain name, just save it.
>    //
> -  if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) != '[')) {
> -    ConfigNvData->DnsMode = TRUE;
> +  if (ConfigNvData->DnsMode) {
>      if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {
>        return EFI_INVALID_PARAMETER;
>      }
>      CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);
>      ConfigNvData->TargetUrl[Field->Len + 1] = '\0';
> --
> 1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [patch] NetworkPkg: Fix bug in iSCSI mode ipv6 when enabling target DHCP.
Posted by Ye, Ting 7 years, 6 months ago 
Reviewed-by: Ye Ting <ting.ye@intel.com> 

-----Original Message-----
From: Zhang, Lubo 
Sent: Friday, April 28, 2017 2:40 PM
To: edk2-devel@lists.01.org
Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
Subject: [patch] NetworkPkg: Fix bug in iSCSI mode ipv6 when enabling target DHCP.

if the server name expressed as a site local address begain with FEC0 when retrieving from dhcpv6 option 59 boot file url, it incorrectly process it as a dns name.

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>
---
 NetworkPkg/IScsiDxe/IScsiDhcp6.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
index d3535d5..06c634c 100644
--- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
@@ -48,11 +48,11 @@ IScsiDhcp6ExtractRootPath (
   ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;
   EFI_IP_ADDRESS              Ip;
   UINT8                       IpMode;  
 
   ConfigNvData = &ConfigData->SessionConfigData;
-
+  ConfigNvData->DnsMode = FALSE;
   //
   // "iscsi:"<servername>":"<protocol>":"<port>":"<LUN>":"<targetname>
   //
   IScsiRootPathIdLen = (UINT16) AsciiStrLen (ISCSI_ROOT_PATH_ID);
 
@@ -80,27 +80,40 @@ IScsiDhcp6ExtractRootPath (
 
   //
   // Extract SERVERNAME field in the Root Path option.
   //
   if (TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_START_DELIMITER) {
-    Status = EFI_INVALID_PARAMETER;
-    goto ON_EXIT;
+    //
+    // The servername is expressed as domain name.
+    //
+    ConfigNvData->DnsMode = TRUE;
   } else {
     Index++;
   }
 
   Fields[RP_FIELD_IDX_SERVERNAME].Str = &TmpStr[Index];
 
-  while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER) && (Index < Length)) {
-    Index++;
-  }
+  if (!ConfigNvData->DnsMode) {
+    while ((TmpStr[Index] != ISCSI_ROOT_PATH_ADDR_END_DELIMITER)&& (Index < Length)) {
+      Index++;
+    }
 
-  //
-  // Skip ']' and ':'.
-  //
-  TmpStr[Index] = '\0';
-  Index += 2;
+    //
+    // Skip ']' and ':'.
+    //
+    TmpStr[Index] = '\0';
+    Index += 2;
+  } else {
+    while ((TmpStr[Index] != ISCSI_ROOT_PATH_FIELD_DELIMITER) && (Index < Length)) {
+      Index++;
+    }
+    //
+    // Skip ':'.
+    //
+    TmpStr[Index] = '\0';
+    Index += 1;
+  }
 
   Fields[RP_FIELD_IDX_SERVERNAME].Len = (UINT8) AsciiStrLen (Fields[RP_FIELD_IDX_SERVERNAME].Str);
 
   //
   // Extract others fields in the Root Path option string.
@@ -151,12 +164,11 @@ IScsiDhcp6ExtractRootPath (
   }
 
   //
   // Server name is expressed as domain name, just save it.
   //
-  if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) != '[')) {
-    ConfigNvData->DnsMode = TRUE;
+  if (ConfigNvData->DnsMode) {
     if (Field->Len > sizeof (ConfigNvData->TargetUrl)) {
       return EFI_INVALID_PARAMETER;
     }
     CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);
     ConfigNvData->TargetUrl[Field->Len + 1] = '\0';
--
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.