Re: [PATCH v2] NetworkPkg/Ip6Dxe: Fix ASSERT logic in Ip6ProcessRouterAdvertise()

["Wu, Jiaxin" <jiaxin.wu@intel.com>]

Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>


> -----Original Message-----
> From: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Sent: Thursday, April 2, 2020 5:15 PM
> To: devel@edk2.groups.io
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>;
> Laszlo Ersek <lersek@redhat.com>
> Subject: [PATCH v2] NetworkPkg/Ip6Dxe: Fix ASSERT logic in
> Ip6ProcessRouterAdvertise()
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2655
> 
> This patch fixes reversed logic of recently added ASSERTs which should
> ensure that Ip6IsNDOptionValid() implementation properly reacts to invalid
> packets.
> 
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>
> Tested-by: Laszlo Ersek <lersek@redhat.com>
> Fixes: 9c20342eed70ec99ec50cd73cb81804299f05403
> ---
>  NetworkPkg/Ip6Dxe/Ip6Nd.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.c b/NetworkPkg/Ip6Dxe/Ip6Nd.c
> index fd7f60b2f92c..0780a98cb325 100644
> --- a/NetworkPkg/Ip6Dxe/Ip6Nd.c
> +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.c
> @@ -2111,7 +2111,7 @@ Ip6ProcessRouterAdvertise (
>        // Option size validity ensured by Ip6IsNDOptionValid().
> 
>        //
> 
>        ASSERT (LinkLayerOption.Length != 0);
> 
> -      ASSERT (Offset + (UINT32) LinkLayerOption.Length * 8 >= (UINT32) Head-
> >PayloadLength);
> 
> +      ASSERT (Offset + (UINT32) LinkLayerOption.Length * 8 <= (UINT32)
> Head->PayloadLength);
> 
> 
> 
>        ZeroMem (&LinkLayerAddress, sizeof (EFI_MAC_ADDRESS));
> 
>        CopyMem (&LinkLayerAddress, LinkLayerOption.EtherAddr, 6);
> 
> @@ -2164,7 +2164,7 @@ Ip6ProcessRouterAdvertise (
>        // Option size validity ensured by Ip6IsNDOptionValid().
> 
>        //
> 
>        ASSERT (PrefixOption.Length == 4);
> 
> -      ASSERT (Offset + (UINT32) PrefixOption.Length * 8 >= (UINT32) Head-
> >PayloadLength);
> 
> +      ASSERT (Offset + (UINT32) PrefixOption.Length * 8 <= (UINT32) Head-
> >PayloadLength);
> 
> 
> 
>        PrefixOption.ValidLifetime     = NTOHL (PrefixOption.ValidLifetime);
> 
>        PrefixOption.PreferredLifetime = NTOHL
> (PrefixOption.PreferredLifetime);
> 
> @@ -2334,7 +2334,7 @@ Ip6ProcessRouterAdvertise (
>        // Option size validity ensured by Ip6IsNDOptionValid().
> 
>        //
> 
>        ASSERT (MTUOption.Length == 1);
> 
> -      ASSERT (Offset + (UINT32) MTUOption.Length * 8 >= (UINT32) Head-
> >PayloadLength);
> 
> +      ASSERT (Offset + (UINT32) MTUOption.Length * 8 <= (UINT32) Head-
> >PayloadLength);
> 
> 
> 
>        //
> 
>        // Use IPv6 minimum link MTU 1280 bytes as the maximum packet size in
> order
> 
> --
> 2.24.0.windows.2