[Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case
@ 2016-11-25  6:15 Jiaxin Wu
  2016-11-25  6:43 ` Fu, Siyuan
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Jiaxin Wu @ 2016-11-25  6:15 UTC (permalink / raw)
  To: edk2-devel; +Cc: Zhang Lubo, Fu Siyuan, Ye Ting

Handle an invalid IPv6 address in NetLibAsciiStrToIp6(),
like '2000:aaaa::1com'.

Cc: Zhang Lubo <lubo.zhang@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
---
 MdeModulePkg/Include/Library/NetLib.h      |  1 +
 MdeModulePkg/Library/DxeNetLib/DxeNetLib.c | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 26709af..09ead09 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -521,10 +521,11 @@ extern IP4_ADDR gIp4AllMasks[IP4_MASK_NUM];
 
 
 extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
 
 #define NET_IS_DIGIT(Ch)            (('0' <= (Ch)) && ((Ch) <= '9'))
+#define NET_IS_HEX(Ch)              ((('0' <= (Ch)) && ((Ch) <= '9')) || (('A' <= (Ch)) && ((Ch) <= 'F')) || (('a' <= (Ch)) && ((Ch) <= 'f')))
 #define NET_ROUNDUP(size, unit)     (((size) + (unit) - 1) & (~((unit) - 1)))
 #define NET_IS_LOWER_CASE_CHAR(Ch)  (('a' <= (Ch)) && ((Ch) <= 'z'))
 #define NET_IS_UPPER_CASE_CHAR(Ch)  (('A' <= (Ch)) && ((Ch) <= 'Z'))
 
 #define TICKS_PER_MS            10000U
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 0804052..0a7117c 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -2830,10 +2830,21 @@ NetLibAsciiStrToIp6 (
 
   for (Index = 0; Index < 15; Index = (UINT8) (Index + 2)) {
     TempStr = Ip6Str;
 
     while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {
+      if (Index != 14 && !NET_IS_HEX (*Ip6Str)) {
+        return EFI_INVALID_PARAMETER;
+      }
+      
+      //
+      // Allow the IPv6 with prefix case, e.g. 2000:aaaa::10/24 
+      //
+      if (Index == 14 && !NET_IS_HEX (*Ip6Str) && *Ip6Str != '/') {
+        return EFI_INVALID_PARAMETER;
+      }
+      
       Ip6Str++;
     }
 
     if ((*Ip6Str == '\0') && (Index != 14)) {
       return EFI_INVALID_PARAMETER;
-- 
1.9.5.msysgit.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case
  2016-11-25  6:15 [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case Jiaxin Wu
@ 2016-11-25  6:43 ` Fu, Siyuan
  2016-11-25  7:20 ` Ye, Ting
  2016-11-25  8:13 ` Zhang, Lubo
  2 siblings, 0 replies; 4+ messages in thread
From: Fu, Siyuan @ 2016-11-25  6:43 UTC (permalink / raw)
  To: Wu, Jiaxin, edk2-devel@lists.01.org; +Cc: Zhang, Lubo, Ye, Ting

Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>



> -----Original Message-----
> From: Wu, Jiaxin
> Sent: Friday, November 25, 2016 2:16 PM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Lubo <lubo.zhang@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>;
> Ye, Ting <ting.ye@intel.com>
> Subject: [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case
> 
> Handle an invalid IPv6 address in NetLibAsciiStrToIp6(),
> like '2000:aaaa::1com'.
> 
> Cc: Zhang Lubo <lubo.zhang@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
> ---
>  MdeModulePkg/Include/Library/NetLib.h      |  1 +
>  MdeModulePkg/Library/DxeNetLib/DxeNetLib.c | 11 +++++++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/MdeModulePkg/Include/Library/NetLib.h
> b/MdeModulePkg/Include/Library/NetLib.h
> index 26709af..09ead09 100644
> --- a/MdeModulePkg/Include/Library/NetLib.h
> +++ b/MdeModulePkg/Include/Library/NetLib.h
> @@ -521,10 +521,11 @@ extern IP4_ADDR gIp4AllMasks[IP4_MASK_NUM];
> 
> 
>  extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
> 
>  #define NET_IS_DIGIT(Ch)            (('0' <= (Ch)) && ((Ch) <= '9'))
> +#define NET_IS_HEX(Ch)              ((('0' <= (Ch)) && ((Ch) <= '9')) ||
> (('A' <= (Ch)) && ((Ch) <= 'F')) || (('a' <= (Ch)) && ((Ch) <= 'f')))
>  #define NET_ROUNDUP(size, unit)     (((size) + (unit) - 1) & (~((unit) -
> 1)))
>  #define NET_IS_LOWER_CASE_CHAR(Ch)  (('a' <= (Ch)) && ((Ch) <= 'z'))
>  #define NET_IS_UPPER_CASE_CHAR(Ch)  (('A' <= (Ch)) && ((Ch) <= 'Z'))
> 
>  #define TICKS_PER_MS            10000U
> diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
> b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
> index 0804052..0a7117c 100644
> --- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
> +++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
> @@ -2830,10 +2830,21 @@ NetLibAsciiStrToIp6 (
> 
>    for (Index = 0; Index < 15; Index = (UINT8) (Index + 2)) {
>      TempStr = Ip6Str;
> 
>      while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {
> +      if (Index != 14 && !NET_IS_HEX (*Ip6Str)) {
> +        return EFI_INVALID_PARAMETER;
> +      }
> +
> +      //
> +      // Allow the IPv6 with prefix case, e.g. 2000:aaaa::10/24
> +      //
> +      if (Index == 14 && !NET_IS_HEX (*Ip6Str) && *Ip6Str != '/') {
> +        return EFI_INVALID_PARAMETER;
> +      }
> +
>        Ip6Str++;
>      }
> 
>      if ((*Ip6Str == '\0') && (Index != 14)) {
>        return EFI_INVALID_PARAMETER;
> --
> 1.9.5.msysgit.1



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case
  2016-11-25  6:15 [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case Jiaxin Wu
  2016-11-25  6:43 ` Fu, Siyuan
@ 2016-11-25  7:20 ` Ye, Ting
  2016-11-25  8:13 ` Zhang, Lubo
  2 siblings, 0 replies; 4+ messages in thread
From: Ye, Ting @ 2016-11-25  7:20 UTC (permalink / raw)
  To: Wu, Jiaxin, edk2-devel@lists.01.org; +Cc: Zhang, Lubo, Fu, Siyuan

Reviewed-by: Ye Ting <ting.ye@intel.com> 

-----Original Message-----
From: Wu, Jiaxin 
Sent: Friday, November 25, 2016 2:16 PM
To: edk2-devel@lists.01.org
Cc: Zhang, Lubo <lubo.zhang@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Ye, Ting <ting.ye@intel.com>
Subject: [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case

Handle an invalid IPv6 address in NetLibAsciiStrToIp6(), like '2000:aaaa::1com'.

Cc: Zhang Lubo <lubo.zhang@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
---
 MdeModulePkg/Include/Library/NetLib.h      |  1 +
 MdeModulePkg/Library/DxeNetLib/DxeNetLib.c | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 26709af..09ead09 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -521,10 +521,11 @@ extern IP4_ADDR gIp4AllMasks[IP4_MASK_NUM];
 
 
 extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
 
 #define NET_IS_DIGIT(Ch)            (('0' <= (Ch)) && ((Ch) <= '9'))
+#define NET_IS_HEX(Ch)              ((('0' <= (Ch)) && ((Ch) <= '9')) || (('A' <= (Ch)) && ((Ch) <= 'F')) || (('a' <= (Ch)) && ((Ch) <= 'f')))
 #define NET_ROUNDUP(size, unit)     (((size) + (unit) - 1) & (~((unit) - 1)))
 #define NET_IS_LOWER_CASE_CHAR(Ch)  (('a' <= (Ch)) && ((Ch) <= 'z'))  #define NET_IS_UPPER_CASE_CHAR(Ch)  (('A' <= (Ch)) && ((Ch) <= 'Z'))
 
 #define TICKS_PER_MS            10000U
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 0804052..0a7117c 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -2830,10 +2830,21 @@ NetLibAsciiStrToIp6 (
 
   for (Index = 0; Index < 15; Index = (UINT8) (Index + 2)) {
     TempStr = Ip6Str;
 
     while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {
+      if (Index != 14 && !NET_IS_HEX (*Ip6Str)) {
+        return EFI_INVALID_PARAMETER;
+      }
+      
+      //
+      // Allow the IPv6 with prefix case, e.g. 2000:aaaa::10/24 
+      //
+      if (Index == 14 && !NET_IS_HEX (*Ip6Str) && *Ip6Str != '/') {
+        return EFI_INVALID_PARAMETER;
+      }
+      
       Ip6Str++;
     }
 
     if ((*Ip6Str == '\0') && (Index != 14)) {
       return EFI_INVALID_PARAMETER;
--
1.9.5.msysgit.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case
  2016-11-25  6:15 [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case Jiaxin Wu
  2016-11-25  6:43 ` Fu, Siyuan
  2016-11-25  7:20 ` Ye, Ting
@ 2016-11-25  8:13 ` Zhang, Lubo
  2 siblings, 0 replies; 4+ messages in thread
From: Zhang, Lubo @ 2016-11-25  8:13 UTC (permalink / raw)
  To: Wu, Jiaxin, edk2-devel@lists.01.org; +Cc: Fu, Siyuan, Ye, Ting

Reviewed-by: Zhang Lubo <lubo.zhang@intel.com>

-----Original Message-----
From: Wu, Jiaxin 
Sent: Friday, November 25, 2016 2:16 PM
To: edk2-devel@lists.01.org
Cc: Zhang, Lubo <lubo.zhang@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Ye, Ting <ting.ye@intel.com>
Subject: [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case

Handle an invalid IPv6 address in NetLibAsciiStrToIp6(), like '2000:aaaa::1com'.

Cc: Zhang Lubo <lubo.zhang@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
---
 MdeModulePkg/Include/Library/NetLib.h      |  1 +
 MdeModulePkg/Library/DxeNetLib/DxeNetLib.c | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 26709af..09ead09 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -521,10 +521,11 @@ extern IP4_ADDR gIp4AllMasks[IP4_MASK_NUM];
 
 
 extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
 
 #define NET_IS_DIGIT(Ch)            (('0' <= (Ch)) && ((Ch) <= '9'))
+#define NET_IS_HEX(Ch)              ((('0' <= (Ch)) && ((Ch) <= '9')) || (('A' <= (Ch)) && ((Ch) <= 'F')) || (('a' <= (Ch)) && ((Ch) <= 'f')))
 #define NET_ROUNDUP(size, unit)     (((size) + (unit) - 1) & (~((unit) - 1)))
 #define NET_IS_LOWER_CASE_CHAR(Ch)  (('a' <= (Ch)) && ((Ch) <= 'z'))  #define NET_IS_UPPER_CASE_CHAR(Ch)  (('A' <= (Ch)) && ((Ch) <= 'Z'))
 
 #define TICKS_PER_MS            10000U
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 0804052..0a7117c 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -2830,10 +2830,21 @@ NetLibAsciiStrToIp6 (
 
   for (Index = 0; Index < 15; Index = (UINT8) (Index + 2)) {
     TempStr = Ip6Str;
 
     while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {
+      if (Index != 14 && !NET_IS_HEX (*Ip6Str)) {
+        return EFI_INVALID_PARAMETER;
+      }
+      
+      //
+      // Allow the IPv6 with prefix case, e.g. 2000:aaaa::10/24 
+      //
+      if (Index == 14 && !NET_IS_HEX (*Ip6Str) && *Ip6Str != '/') {
+        return EFI_INVALID_PARAMETER;
+      }
+      
       Ip6Str++;
     }
 
     if ((*Ip6Str == '\0') && (Index != 14)) {
       return EFI_INVALID_PARAMETER;
--
1.9.5.msysgit.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-11-25  8:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-25  6:15 [Patch] MdeModulePkg/NetLib: Handle an invalid IPv6 address case Jiaxin Wu
2016-11-25  6:43 ` Fu, Siyuan
2016-11-25  7:20 ` Ye, Ting
2016-11-25  8:13 ` Zhang, Lubo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox