[PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559)

[PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559)

[Armour, Nicholas]

Update copyright

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Nicholas Armour <nicholas.armour@intel.com>
---
 NetworkPkg/ArpDxe/ArpImpl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
index 9cdb33f2bd66..ed2d756d3e17 100644
--- a/NetworkPkg/ArpDxe/ArpImpl.c
+++ b/NetworkPkg/ArpDxe/ArpImpl.c
@@ -1,7 +1,7 @@
 /** @file
   The implementation of the ARP protocol.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -113,7 +113,7 @@ ArpOnFrameRcvdDpc (
     //
     // Restart the receiving if packet size is not correct.
     //
-    goto RESTART_RECEIVE;
+    goto RECYCLE_RXDATA;
   }
 
   //
@@ -125,7 +125,7 @@ ArpOnFrameRcvdDpc (
   Head->OpCode    = NTOHS (Head->OpCode);
 
   if (RxData->DataLength < (sizeof (ARP_HEAD) + 2 * Head->HwAddrLen + 2 * Head->ProtoAddrLen)) {
-    goto RESTART_RECEIVE;
+    goto RECYCLE_RXDATA;
   }
 
   if ((Head->HwType != ArpService->SnpMode.IfType) ||
-- 
2.16.2.windows.1

Re: [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559)

[Siyuan, Fu]

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

> -----Original Message-----
> From: Armour, Nicholas <nicholas.armour@intel.com>
> Sent: 2020年2月20日 8:23
> To: devel@edk2.groups.io
> Cc: Armour, Nicholas <nicholas.armour@intel.com>; Wu, Jiaxin
> <jiaxin.wu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>; Fu,
> Siyuan <siyuan.fu@intel.com>
> Subject: [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets
> (CVE-2019-14559)
> 
> Update copyright
> 
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Signed-off-by: Nicholas Armour <nicholas.armour@intel.com>
> ---
>  NetworkPkg/ArpDxe/ArpImpl.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
> index 9cdb33f2bd66..ed2d756d3e17 100644
> --- a/NetworkPkg/ArpDxe/ArpImpl.c
> +++ b/NetworkPkg/ArpDxe/ArpImpl.c
> @@ -1,7 +1,7 @@
>  /** @file
>    The implementation of the ARP protocol.
> 
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -113,7 +113,7 @@ ArpOnFrameRcvdDpc (
>      //
>      // Restart the receiving if packet size is not correct.
>      //
> -    goto RESTART_RECEIVE;
> +    goto RECYCLE_RXDATA;
>    }
> 
>    //
> @@ -125,7 +125,7 @@ ArpOnFrameRcvdDpc (
>    Head->OpCode    = NTOHS (Head->OpCode);
> 
>    if (RxData->DataLength < (sizeof (ARP_HEAD) + 2 * Head->HwAddrLen + 2 *
> Head->ProtoAddrLen)) {
> -    goto RESTART_RECEIVE;
> +    goto RECYCLE_RXDATA;
>    }
> 
>    if ((Head->HwType != ArpService->SnpMode.IfType) ||
> --
> 2.16.2.windows.1

Re: [edk2-devel] [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559)

[Liming Gao]

This patch is for BZ https://bugzilla.tianocore.org/show_bug.cgi?id=2031

So, please add this line into the commit message. This can be done when submit this patch. Don't need to send the patch again. 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2031

Thanks
Liming
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Siyuan, Fu
> Sent: Thursday, February 20, 2020 8:31 AM
> To: Armour, Nicholas <nicholas.armour@intel.com>; devel@edk2.groups.io
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Subject: Re: [edk2-devel] [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559)
> 
> Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>
> 
> > -----Original Message-----
> > From: Armour, Nicholas <nicholas.armour@intel.com>
> > Sent: 2020年2月20日 8:23
> > To: devel@edk2.groups.io
> > Cc: Armour, Nicholas <nicholas.armour@intel.com>; Wu, Jiaxin
> > <jiaxin.wu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>; Fu,
> > Siyuan <siyuan.fu@intel.com>
> > Subject: [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets
> > (CVE-2019-14559)
> >
> > Update copyright
> >
> > Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> > Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> > Cc: Siyuan Fu <siyuan.fu@intel.com>
> > Signed-off-by: Nicholas Armour <nicholas.armour@intel.com>
> > ---
> >  NetworkPkg/ArpDxe/ArpImpl.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
> > index 9cdb33f2bd66..ed2d756d3e17 100644
> > --- a/NetworkPkg/ArpDxe/ArpImpl.c
> > +++ b/NetworkPkg/ArpDxe/ArpImpl.c
> > @@ -1,7 +1,7 @@
> >  /** @file
> >    The implementation of the ARP protocol.
> >
> > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> > +Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> >  SPDX-License-Identifier: BSD-2-Clause-Patent
> >
> >  **/
> > @@ -113,7 +113,7 @@ ArpOnFrameRcvdDpc (
> >      //
> >      // Restart the receiving if packet size is not correct.
> >      //
> > -    goto RESTART_RECEIVE;
> > +    goto RECYCLE_RXDATA;
> >    }
> >
> >    //
> > @@ -125,7 +125,7 @@ ArpOnFrameRcvdDpc (
> >    Head->OpCode    = NTOHS (Head->OpCode);
> >
> >    if (RxData->DataLength < (sizeof (ARP_HEAD) + 2 * Head->HwAddrLen + 2 *
> > Head->ProtoAddrLen)) {
> > -    goto RESTART_RECEIVE;
> > +    goto RECYCLE_RXDATA;
> >    }
> >
> >    if ((Head->HwType != ArpService->SnpMode.IfType) ||
> > --
> > 2.16.2.windows.1
> 
> 
>