* [Patch 0/2] Check for NULL pointer before dereference
@ 2016-10-31 2:22 Fu Siyuan
2016-10-31 2:23 ` [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it Fu Siyuan
2016-10-31 2:23 ` [Patch 2/2] NetworkPkg: " Fu Siyuan
0 siblings, 2 replies; 8+ messages in thread
From: Fu Siyuan @ 2016-10-31 2:22 UTC (permalink / raw)
To: edk2-devel
Fu Siyuan (2):
MdeModulePkg: Check for NULL pointer before dereference it.
NetworkPkg: Check for NULL pointer before dereference it.
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 ++++++++
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
--
2.7.4.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
2016-10-31 2:22 [Patch 0/2] Check for NULL pointer before dereference Fu Siyuan
@ 2016-10-31 2:23 ` Fu Siyuan
2016-10-31 7:22 ` Wu, Jiaxin
2016-10-31 2:23 ` [Patch 2/2] NetworkPkg: " Fu Siyuan
1 sibling, 1 reply; 8+ messages in thread
From: Fu Siyuan @ 2016-10-31 2:23 UTC (permalink / raw)
To: edk2-devel; +Cc: Ye Ting, Zhang Lubo, Wu Jiaxin
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Zhang Lubo <lubo.zhang@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
---
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 4746256..43568ed 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -2317,6 +2317,14 @@ EfiPxeBcSetStationIP (
if (NewSubnetMask != NULL && !IP4_IS_VALID_NETMASK (NTOHL (NewSubnetMask->Addr[0]))) {
return EFI_INVALID_PARAMETER;
}
+
+ if (NewStationIp != NULL) {
+ if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
+ IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
+ (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
+ return EFI_INVALID_PARAMETER;
+ }
+ }
if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
return EFI_INVALID_PARAMETER;
--
2.7.4.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.
2016-10-31 2:22 [Patch 0/2] Check for NULL pointer before dereference Fu Siyuan
2016-10-31 2:23 ` [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it Fu Siyuan
@ 2016-10-31 2:23 ` Fu Siyuan
2016-10-31 7:22 ` Wu, Jiaxin
1 sibling, 1 reply; 8+ messages in thread
From: Fu Siyuan @ 2016-10-31 2:23 UTC (permalink / raw)
To: edk2-devel; +Cc: Ye Ting, Zhang Lubo, Wu Jiaxin
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Zhang Lubo <lubo.zhang@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
---
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
index 52095c5..0552174 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
@@ -2013,10 +2013,14 @@ EfiPxeBcSetStationIP (
return EFI_INVALID_PARAMETER;
}
- if (!Mode->UsingIpv6 && NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
- return EFI_INVALID_PARAMETER;
+ if (!Mode->UsingIpv6 && NewStationIp != NULL) {
+ if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
+ IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
+ (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
+ return EFI_INVALID_PARAMETER;
+ }
}
-
+
if (!Mode->Started) {
return EFI_NOT_STARTED;
}
--
2.7.4.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
2016-10-31 2:23 ` [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it Fu Siyuan
@ 2016-10-31 7:22 ` Wu, Jiaxin
2016-10-31 7:29 ` Fu, Siyuan
0 siblings, 1 reply; 8+ messages in thread
From: Wu, Jiaxin @ 2016-10-31 7:22 UTC (permalink / raw)
To: Fu, Siyuan, edk2-devel@lists.01.org; +Cc: Ye, Ting, Zhang, Lubo
Siyuan,
I think the below piece code should be dropped in EfiPxeBcSetStationIP() function:
if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
return EFI_INVALID_PARAMETER;
}
Others is good to me.
Reviewed-By: Wu Jiaxin <jiaxin.wu@intel.com>
Best Regards!
Jiaxin
> -----Original Message-----
> From: Fu, Siyuan
> Sent: Monday, October 31, 2016 10:23 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>; Wu,
> Jiaxin <jiaxin.wu@intel.com>
> Subject: [Patch 1/2] MdeModulePkg: Check for NULL pointer before
> dereference it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Zhang Lubo <lubo.zhang@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
> MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> index 4746256..43568ed 100644
> --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> @@ -2317,6 +2317,14 @@ EfiPxeBcSetStationIP (
> if (NewSubnetMask != NULL && !IP4_IS_VALID_NETMASK (NTOHL
> (NewSubnetMask->Addr[0]))) {
> return EFI_INVALID_PARAMETER;
> }
> +
> + if (NewStationIp != NULL) {
> + if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
> + IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
> + (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
> + return EFI_INVALID_PARAMETER;
> + }
> + }
>
> if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
> return EFI_INVALID_PARAMETER;
> --
> 2.7.4.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.
2016-10-31 2:23 ` [Patch 2/2] NetworkPkg: " Fu Siyuan
@ 2016-10-31 7:22 ` Wu, Jiaxin
2016-10-31 7:35 ` Ye, Ting
0 siblings, 1 reply; 8+ messages in thread
From: Wu, Jiaxin @ 2016-10-31 7:22 UTC (permalink / raw)
To: Fu, Siyuan, edk2-devel@lists.01.org; +Cc: Ye, Ting, Zhang, Lubo
Reviewed-By: Wu Jiaxin <jiaxin.wu@intel.com>
Best Regards!
Jiaxin
> -----Original Message-----
> From: Fu, Siyuan
> Sent: Monday, October 31, 2016 10:23 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>; Wu,
> Jiaxin <jiaxin.wu@intel.com>
> Subject: [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Zhang Lubo <lubo.zhang@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
> NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> index 52095c5..0552174 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> @@ -2013,10 +2013,14 @@ EfiPxeBcSetStationIP (
> return EFI_INVALID_PARAMETER;
> }
>
> - if (!Mode->UsingIpv6 && NewStationIp != NULL && !NetIp4IsUnicast (NTOHL
> (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
> - return EFI_INVALID_PARAMETER;
> + if (!Mode->UsingIpv6 && NewStationIp != NULL) {
> + if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
> + IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
> + (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
> + return EFI_INVALID_PARAMETER;
> + }
> }
> -
> +
> if (!Mode->Started) {
> return EFI_NOT_STARTED;
> }
> --
> 2.7.4.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
2016-10-31 7:22 ` Wu, Jiaxin
@ 2016-10-31 7:29 ` Fu, Siyuan
2016-10-31 7:35 ` Ye, Ting
0 siblings, 1 reply; 8+ messages in thread
From: Fu, Siyuan @ 2016-10-31 7:29 UTC (permalink / raw)
To: Wu, Jiaxin, edk2-devel@lists.01.org; +Cc: Ye, Ting, Zhang, Lubo
Thanks Jiaxin, you are correct. I will delete these line when commit the patch.
BestRegards
Fu Siyuan
From: Wu, Jiaxin
Sent: Monday, October 31, 2016 3:22 PM
To: Fu, Siyuan <siyuan.fu@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>
Subject: RE: [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
Siyuan,
I think the below piece code should be dropped in EfiPxeBcSetStationIP() function:
if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
return EFI_INVALID_PARAMETER;
}
Others is good to me.
Reviewed-By: Wu Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>
Best Regards!
Jiaxin
> -----Original Message-----
> From: Fu, Siyuan
> Sent: Monday, October 31, 2016 10:23 AM
> To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> Cc: Ye, Ting <ting.ye@intel.com<mailto:ting.ye@intel.com>>; Zhang, Lubo <lubo.zhang@intel.com<mailto:lubo.zhang@intel.com>>; Wu,
> Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>
> Subject: [Patch 1/2] MdeModulePkg: Check for NULL pointer before
> dereference it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com<mailto:siyuan.fu@intel.com>>
> Cc: Ye Ting <ting.ye@intel.com<mailto:ting.ye@intel.com>>
> Cc: Zhang Lubo <lubo.zhang@intel.com<mailto:lubo.zhang@intel.com>>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>
> ---
> MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> index 4746256..43568ed 100644
> --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> @@ -2317,6 +2317,14 @@ EfiPxeBcSetStationIP (
> if (NewSubnetMask != NULL && !IP4_IS_VALID_NETMASK (NTOHL
> (NewSubnetMask->Addr[0]))) {
> return EFI_INVALID_PARAMETER;
> }
> +
> + if (NewStationIp != NULL) {
> + if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
> + IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
> + (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
> + return EFI_INVALID_PARAMETER;
> + }
> + }
>
> if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
> return EFI_INVALID_PARAMETER;
> --
> 2.7.4.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
2016-10-31 7:29 ` Fu, Siyuan
@ 2016-10-31 7:35 ` Ye, Ting
0 siblings, 0 replies; 8+ messages in thread
From: Ye, Ting @ 2016-10-31 7:35 UTC (permalink / raw)
To: Fu, Siyuan, Wu, Jiaxin, edk2-devel@lists.01.org; +Cc: Zhang, Lubo
Reviewed-by: Ye Ting <ting.ye@intel.com<mailto:ting.ye@intel.com>>
From: Fu, Siyuan
Sent: Monday, October 31, 2016 3:29 PM
To: Wu, Jiaxin <jiaxin.wu@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>
Subject: RE: [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
Thanks Jiaxin, you are correct. I will delete these line when commit the patch.
BestRegards
Fu Siyuan
From: Wu, Jiaxin
Sent: Monday, October 31, 2016 3:22 PM
To: Fu, Siyuan <siyuan.fu@intel.com<mailto:siyuan.fu@intel.com>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
Cc: Ye, Ting <ting.ye@intel.com<mailto:ting.ye@intel.com>>; Zhang, Lubo <lubo.zhang@intel.com<mailto:lubo.zhang@intel.com>>
Subject: RE: [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.
Siyuan,
I think the below piece code should be dropped in EfiPxeBcSetStationIP() function:
if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
return EFI_INVALID_PARAMETER;
}
Others is good to me.
Reviewed-By: Wu Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>
Best Regards!
Jiaxin
> -----Original Message-----
> From: Fu, Siyuan
> Sent: Monday, October 31, 2016 10:23 AM
> To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> Cc: Ye, Ting <ting.ye@intel.com<mailto:ting.ye@intel.com>>; Zhang, Lubo <lubo.zhang@intel.com<mailto:lubo.zhang@intel.com>>; Wu,
> Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>
> Subject: [Patch 1/2] MdeModulePkg: Check for NULL pointer before
> dereference it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com<mailto:siyuan.fu@intel.com>>
> Cc: Ye Ting <ting.ye@intel.com<mailto:ting.ye@intel.com>>
> Cc: Zhang Lubo <lubo.zhang@intel.com<mailto:lubo.zhang@intel.com>>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com<mailto:jiaxin.wu@intel.com>>
> ---
> MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> index 4746256..43568ed 100644
> --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
> @@ -2317,6 +2317,14 @@ EfiPxeBcSetStationIP (
> if (NewSubnetMask != NULL && !IP4_IS_VALID_NETMASK (NTOHL
> (NewSubnetMask->Addr[0]))) {
> return EFI_INVALID_PARAMETER;
> }
> +
> + if (NewStationIp != NULL) {
> + if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
> + IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
> + (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
> + return EFI_INVALID_PARAMETER;
> + }
> + }
>
> if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
> return EFI_INVALID_PARAMETER;
> --
> 2.7.4.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.
2016-10-31 7:22 ` Wu, Jiaxin
@ 2016-10-31 7:35 ` Ye, Ting
0 siblings, 0 replies; 8+ messages in thread
From: Ye, Ting @ 2016-10-31 7:35 UTC (permalink / raw)
To: Wu, Jiaxin, Fu, Siyuan, edk2-devel@lists.01.org; +Cc: Zhang, Lubo
Reviewed-by: Ye Ting <ting.ye@intel.com>
-----Original Message-----
From: Wu, Jiaxin
Sent: Monday, October 31, 2016 3:23 PM
To: Fu, Siyuan <siyuan.fu@intel.com>; edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>
Subject: RE: [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.
Reviewed-By: Wu Jiaxin <jiaxin.wu@intel.com>
Best Regards!
Jiaxin
> -----Original Message-----
> From: Fu, Siyuan
> Sent: Monday, October 31, 2016 10:23 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>;
> Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Zhang Lubo <lubo.zhang@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
> NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> index 52095c5..0552174 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> @@ -2013,10 +2013,14 @@ EfiPxeBcSetStationIP (
> return EFI_INVALID_PARAMETER;
> }
>
> - if (!Mode->UsingIpv6 && NewStationIp != NULL && !NetIp4IsUnicast
> (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
> - return EFI_INVALID_PARAMETER;
> + if (!Mode->UsingIpv6 && NewStationIp != NULL) {
> + if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||
> + IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
> + (NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL
> + (NewStationIp-
> >Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {
> + return EFI_INVALID_PARAMETER;
> + }
> }
> -
> +
> if (!Mode->Started) {
> return EFI_NOT_STARTED;
> }
> --
> 2.7.4.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-10-31 7:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-31 2:22 [Patch 0/2] Check for NULL pointer before dereference Fu Siyuan
2016-10-31 2:23 ` [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it Fu Siyuan
2016-10-31 7:22 ` Wu, Jiaxin
2016-10-31 7:29 ` Fu, Siyuan
2016-10-31 7:35 ` Ye, Ting
2016-10-31 2:23 ` [Patch 2/2] NetworkPkg: " Fu Siyuan
2016-10-31 7:22 ` Wu, Jiaxin
2016-10-31 7:35 ` Ye, Ting
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox