* [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559) [not found] <cover.1582158126.git.nicholas.armour@intel.com> @ 2020-02-20 0:23 ` Armour, Nicholas 2020-02-20 0:31 ` Siyuan, Fu 0 siblings, 1 reply; 3+ messages in thread From: Armour, Nicholas @ 2020-02-20 0:23 UTC (permalink / raw) To: devel; +Cc: Nicholas Armour, Jiaxin Wu, Maciej Rabeda, Siyuan Fu 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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559) 2020-02-20 0:23 ` [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559) Armour, Nicholas @ 2020-02-20 0:31 ` Siyuan, Fu 2020-02-20 5:53 ` [edk2-devel] " Liming Gao 0 siblings, 1 reply; 3+ messages in thread From: Siyuan, Fu @ 2020-02-20 0:31 UTC (permalink / raw) To: Armour, Nicholas, devel@edk2.groups.io; +Cc: Wu, Jiaxin, Maciej Rabeda 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559) 2020-02-20 0:31 ` Siyuan, Fu @ 2020-02-20 5:53 ` Liming Gao 0 siblings, 0 replies; 3+ messages in thread From: Liming Gao @ 2020-02-20 5:53 UTC (permalink / raw) To: devel@edk2.groups.io, Fu, Siyuan, Armour, Nicholas Cc: Wu, Jiaxin, Maciej Rabeda 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 > > > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-20 5:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1582158126.git.nicholas.armour@intel.com>
2020-02-20 0:23 ` [PATCH v4 1/1] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559) Armour, Nicholas
2020-02-20 0:31 ` Siyuan, Fu
2020-02-20 5:53 ` [edk2-devel] " Liming Gao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox