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>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Zhang Lubo <lubo.zhang@intel.com>

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 26709af091d1a77214fa1aa3a2e7ed635f4da04a..09ead094977ab9f6768dc0300dec3886d9ae0b94 100644 (file)
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -523,6 +523,7 @@ extern IP4_ADDR gIp4AllMasks[IP4_MASK_NUM];
 extern EFI_IPv4_ADDRESS  mZeroIp4Addr;\r
 \r
 #define NET_IS_DIGIT(Ch)            (('0' <= (Ch)) && ((Ch) <= '9'))\r
+#define NET_IS_HEX(Ch)              ((('0' <= (Ch)) && ((Ch) <= '9')) || (('A' <= (Ch)) && ((Ch) <= 'F')) || (('a' <= (Ch)) && ((Ch) <= 'f')))\r
 #define NET_ROUNDUP(size, unit)     (((size) + (unit) - 1) & (~((unit) - 1)))\r
 #define NET_IS_LOWER_CASE_CHAR(Ch)  (('a' <= (Ch)) && ((Ch) <= 'z'))\r
 #define NET_IS_UPPER_CASE_CHAR(Ch)  (('A' <= (Ch)) && ((Ch) <= 'Z'))\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 0804052fac6639d73bcf68f1997a6258275c2067..0a7117cf9d2e26627886bf5ee611664750bb343c 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -2832,6 +2832,17 @@ NetLibAsciiStrToIp6 (
     TempStr = Ip6Str;\r
 \r
     while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {\r
+      if (Index != 14 && !NET_IS_HEX (*Ip6Str)) {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
+      \r
+      //\r
+      // Allow the IPv6 with prefix case, e.g. 2000:aaaa::10/24 \r
+      //\r
+      if (Index == 14 && !NET_IS_HEX (*Ip6Str) && *Ip6Str != '/') {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
+      \r
       Ip6Str++;\r
     }\r
 \r