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

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

[Armour, Nicholas]

Fixing subject line

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

This patch triggers the RecycleEvent for invalid ARP packets.
Prior to this, we would just ignore invalid ARP packets,
and never free them.

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
index 9cdb33f2bd66..703fe20cc892 100644
--- a/NetworkPkg/ArpDxe/ArpImpl.c
+++ b/NetworkPkg/ArpDxe/ArpImpl.c
@@ -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 v3 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559)

[Siyuan, Fu]

Please change the Copyright year to 2020, with that:

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

> -----Original Message-----
> From: Armour, Nicholas <nicholas.armour@intel.com>
> Sent: 2020年2月20日 6:53
> 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 v3 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets
> (CVE-2019-14559)
> 
> Fixing subject line
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2031
> 
> This patch triggers the RecycleEvent for invalid ARP packets.
> Prior to this, we would just ignore invalid ARP packets,
> and never free them.
> 
> 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 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
> index 9cdb33f2bd66..703fe20cc892 100644
> --- a/NetworkPkg/ArpDxe/ArpImpl.c
> +++ b/NetworkPkg/ArpDxe/ArpImpl.c
> @@ -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