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

["Fu, Siyuan" <siyuan.fu@intel.com>]

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