* [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
@ 2016-12-20 1:41 Hao Wu
2016-12-20 1:42 ` Yao, Jiewen
0 siblings, 1 reply; 6+ messages in thread
From: Hao Wu @ 2016-12-20 1:41 UTC (permalink / raw)
To: edk2-devel; +Cc: Hao Wu, Jiewen Yao, Jeff Fan, Michael Kinney
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
index f4716f3..11fb891 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
@@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
}
} while (Status == EFI_BUFFER_TOO_SMALL);
+ if (MemoryMap == NULL) {
+ return ;
+ }
+
SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
MergeMemoryMapForNotPresentEntry (MemoryMap, &UefiMemoryMapSize, mUefiDescriptorSize);
--
1.9.5.msysgit.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
2016-12-20 1:41 [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference Hao Wu
@ 2016-12-20 1:42 ` Yao, Jiewen
2016-12-20 1:53 ` Kinney, Michael D
0 siblings, 1 reply; 6+ messages in thread
From: Yao, Jiewen @ 2016-12-20 1:42 UTC (permalink / raw)
To: Wu, Hao A, edk2-devel@lists.01.org; +Cc: Fan, Jeff, Kinney, Michael D
Reviewed-by: jiewen.yao@intel.com
> -----Original Message-----
> From: Wu, Hao A
> Sent: Tuesday, December 20, 2016 9:42 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Fan,
> Jeff <jeff.fan@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> dereference
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jeff Fan <jeff.fan@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
> UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> index f4716f3..11fb891 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> @@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
> }
> } while (Status == EFI_BUFFER_TOO_SMALL);
>
> + if (MemoryMap == NULL) {
> + return ;
> + }
> +
> SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
> MergeMemoryMapForNotPresentEntry (MemoryMap,
> &UefiMemoryMapSize, mUefiDescriptorSize);
>
> --
> 1.9.5.msysgit.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
2016-12-20 1:42 ` Yao, Jiewen
@ 2016-12-20 1:53 ` Kinney, Michael D
2016-12-20 2:02 ` Yao, Jiewen
0 siblings, 1 reply; 6+ messages in thread
From: Kinney, Michael D @ 2016-12-20 1:53 UTC (permalink / raw)
To: Yao, Jiewen, Wu, Hao A, edk2-devel@lists.01.org,
Kinney, Michael D
Cc: Fan, Jeff
Jiewen,
What is the behavior of the module/platform if this function returns
before completing its work?
Mike
> -----Original Message-----
> From: Yao, Jiewen
> Sent: Monday, December 19, 2016 5:43 PM
> To: Wu, Hao A <hao.a.wu@intel.com>; edk2-devel@lists.01.org
> Cc: Fan, Jeff <jeff.fan@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> dereference
>
> Reviewed-by: jiewen.yao@intel.com
>
> > -----Original Message-----
> > From: Wu, Hao A
> > Sent: Tuesday, December 20, 2016 9:42 AM
> > To: edk2-devel@lists.01.org
> > Cc: Wu, Hao A <hao.a.wu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Fan,
> > Jeff <jeff.fan@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> > Subject: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> > dereference
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jeff Fan <jeff.fan@intel.com>
> > Cc: Michael Kinney <michael.d.kinney@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> > ---
> > UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > index f4716f3..11fb891 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > @@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
> > }
> > } while (Status == EFI_BUFFER_TOO_SMALL);
> >
> > + if (MemoryMap == NULL) {
> > + return ;
> > + }
> > +
> > SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
> > MergeMemoryMapForNotPresentEntry (MemoryMap,
> > &UefiMemoryMapSize, mUefiDescriptorSize);
> >
> > --
> > 1.9.5.msysgit.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
2016-12-20 1:53 ` Kinney, Michael D
@ 2016-12-20 2:02 ` Yao, Jiewen
2016-12-20 2:06 ` Yao, Jiewen
0 siblings, 1 reply; 6+ messages in thread
From: Yao, Jiewen @ 2016-12-20 2:02 UTC (permalink / raw)
To: Kinney, Michael D, Wu, Hao A, edk2-devel@lists.01.org; +Cc: Fan, Jeff
Hi Mike
1) If there is no memory map, the SetUefiMemMapAttributes() API will return immediately without setting any protection.
SetUefiMemMapAttributes()
{
if (mUefiMemoryMap == NULL) {
DEBUG ((DEBUG_INFO, "UefiMemoryMap - NULL\n"));
return ;
}
}
2) IsSmmCommBufferForbiddenAddress() API will return FALSE directly.
IsSmmCommBufferForbiddenAddress()
{
MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;
for (Index = 0; Index < MemoryMapEntryCount; Index++) {
}
return FALSE;
}
Thank you
Yao Jiewen
From: Kinney, Michael D
Sent: Tuesday, December 20, 2016 9:53 AM
To: Yao, Jiewen <jiewen.yao@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
Cc: Fan, Jeff <jeff.fan@intel.com>
Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
Jiewen,
What is the behavior of the module/platform if this function returns
before completing its work?
Mike
> -----Original Message-----
> From: Yao, Jiewen
> Sent: Monday, December 19, 2016 5:43 PM
> To: Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> Cc: Fan, Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com>>; Kinney, Michael D
> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
> Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> dereference
>
> Reviewed-by: jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>
>
> > -----Original Message-----
> > From: Wu, Hao A
> > Sent: Tuesday, December 20, 2016 9:42 AM
> > To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> > Cc: Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>; Yao, Jiewen <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>; Fan,
> > Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com>>; Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
> > Subject: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> > dereference
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>
> > Cc: Jeff Fan <jeff.fan@intel.com<mailto:jeff.fan@intel.com>>
> > Cc: Michael Kinney <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Hao Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>
> > ---
> > UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > index f4716f3..11fb891 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > @@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
> > }
> > } while (Status == EFI_BUFFER_TOO_SMALL);
> >
> > + if (MemoryMap == NULL) {
> > + return ;
> > + }
> > +
> > SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
> > MergeMemoryMapForNotPresentEntry (MemoryMap,
> > &UefiMemoryMapSize, mUefiDescriptorSize);
> >
> > --
> > 1.9.5.msysgit.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
2016-12-20 2:02 ` Yao, Jiewen
@ 2016-12-20 2:06 ` Yao, Jiewen
2016-12-20 2:23 ` Wu, Hao A
0 siblings, 1 reply; 6+ messages in thread
From: Yao, Jiewen @ 2016-12-20 2:06 UTC (permalink / raw)
To: Yao, Jiewen, Kinney, Michael D, Wu, Hao A,
edk2-devel@lists.01.org
Cc: Fan, Jeff
Maybe we can update IsSmmCommBufferForbiddenAddress() to use similar check - if (mUefiMemoryMap == NULL).
Thank you
Yao Jiewen
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yao, Jiewen
Sent: Tuesday, December 20, 2016 10:02 AM
To: Kinney, Michael D <michael.d.kinney@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; edk2-devel@lists.01.org
Cc: Fan, Jeff <jeff.fan@intel.com>
Subject: Re: [edk2] [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
Hi Mike
1) If there is no memory map, the SetUefiMemMapAttributes() API will return immediately without setting any protection.
SetUefiMemMapAttributes()
{
if (mUefiMemoryMap == NULL) {
DEBUG ((DEBUG_INFO, "UefiMemoryMap - NULL\n"));
return ;
}
}
2) IsSmmCommBufferForbiddenAddress() API will return FALSE directly.
IsSmmCommBufferForbiddenAddress()
{
MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;
for (Index = 0; Index < MemoryMapEntryCount; Index++) {
}
return FALSE;
}
Thank you
Yao Jiewen
From: Kinney, Michael D
Sent: Tuesday, December 20, 2016 9:53 AM
To: Yao, Jiewen <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>; Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>; Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
Cc: Fan, Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com>>
Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
Jiewen,
What is the behavior of the module/platform if this function returns
before completing its work?
Mike
> -----Original Message-----
> From: Yao, Jiewen
> Sent: Monday, December 19, 2016 5:43 PM
> To: Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com<mailto:hao.a.wu@intel.com%3cmailto:hao.a.wu@intel.com>>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org%3cmailto:edk2-devel@lists.01.org>>
> Cc: Fan, Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com<mailto:jeff.fan@intel.com%3cmailto:jeff.fan@intel.com>>>; Kinney, Michael D
> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com%3cmailto:michael.d.kinney@intel.com>>>
> Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> dereference
>
> Reviewed-by: jiewen.yao@intel.com<mailto:jiewen.yao@intel.com<mailto:jiewen.yao@intel.com%3cmailto:jiewen.yao@intel.com>>
>
> > -----Original Message-----
> > From: Wu, Hao A
> > Sent: Tuesday, December 20, 2016 9:42 AM
> > To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org%3cmailto:edk2-devel@lists.01.org>>
> > Cc: Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com<mailto:hao.a.wu@intel.com%3cmailto:hao.a.wu@intel.com>>>; Yao, Jiewen <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com<mailto:jiewen.yao@intel.com%3cmailto:jiewen.yao@intel.com>>>; Fan,
> > Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com<mailto:jeff.fan@intel.com%3cmailto:jeff.fan@intel.com>>>; Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com%3cmailto:michael.d.kinney@intel.com>>>
> > Subject: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> > dereference
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com<mailto:jiewen.yao@intel.com%3cmailto:jiewen.yao@intel.com>>>
> > Cc: Jeff Fan <jeff.fan@intel.com<mailto:jeff.fan@intel.com<mailto:jeff.fan@intel.com%3cmailto:jeff.fan@intel.com>>>
> > Cc: Michael Kinney <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com%3cmailto:michael.d.kinney@intel.com>>>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Hao Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com<mailto:hao.a.wu@intel.com%3cmailto:hao.a.wu@intel.com>>>
> > ---
> > UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > index f4716f3..11fb891 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > @@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
> > }
> > } while (Status == EFI_BUFFER_TOO_SMALL);
> >
> > + if (MemoryMap == NULL) {
> > + return ;
> > + }
> > +
> > SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
> > MergeMemoryMapForNotPresentEntry (MemoryMap,
> > &UefiMemoryMapSize, mUefiDescriptorSize);
> >
> > --
> > 1.9.5.msysgit.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
2016-12-20 2:06 ` Yao, Jiewen
@ 2016-12-20 2:23 ` Wu, Hao A
0 siblings, 0 replies; 6+ messages in thread
From: Wu, Hao A @ 2016-12-20 2:23 UTC (permalink / raw)
To: Yao, Jiewen, Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Fan, Jeff
I have send the V2 of the patch according to the comments.
Thanks for the feedbacks.
Best Regards,
Hao Wu
From: Yao, Jiewen
Sent: Tuesday, December 20, 2016 10:06 AM
To: Yao, Jiewen; Kinney, Michael D; Wu, Hao A; edk2-devel@lists.01.org
Cc: Fan, Jeff
Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
Maybe we can update IsSmmCommBufferForbiddenAddress() to use similar check - if (mUefiMemoryMap == NULL).
Thank you
Yao Jiewen
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yao, Jiewen
Sent: Tuesday, December 20, 2016 10:02 AM
To: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
Cc: Fan, Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com>>
Subject: Re: [edk2] [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
Hi Mike
1) If there is no memory map, the SetUefiMemMapAttributes() API will return immediately without setting any protection.
SetUefiMemMapAttributes()
{
if (mUefiMemoryMap == NULL) {
DEBUG ((DEBUG_INFO, "UefiMemoryMap - NULL\n"));
return ;
}
}
2) IsSmmCommBufferForbiddenAddress() API will return FALSE directly.
IsSmmCommBufferForbiddenAddress()
{
MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;
for (Index = 0; Index < MemoryMapEntryCount; Index++) {
}
return FALSE;
}
Thank you
Yao Jiewen
From: Kinney, Michael D
Sent: Tuesday, December 20, 2016 9:53 AM
To: Yao, Jiewen <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>; Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>; Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
Cc: Fan, Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com>>
Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference
Jiewen,
What is the behavior of the module/platform if this function returns
before completing its work?
Mike
> -----Original Message-----
> From: Yao, Jiewen
> Sent: Monday, December 19, 2016 5:43 PM
> To: Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com<mailto:hao.a.wu@intel.com%3cmailto:hao.a.wu@intel.com>>>; edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org%3cmailto:edk2-devel@lists.01.org>>
> Cc: Fan, Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com<mailto:jeff.fan@intel.com%3cmailto:jeff.fan@intel.com>>>; Kinney, Michael D
> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com%3cmailto:michael.d.kinney@intel.com>>>
> Subject: RE: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> dereference
>
> Reviewed-by: jiewen.yao@intel.com<mailto:jiewen.yao@intel.com<mailto:jiewen.yao@intel.com%3cmailto:jiewen.yao@intel.com>>
>
> > -----Original Message-----
> > From: Wu, Hao A
> > Sent: Tuesday, December 20, 2016 9:42 AM
> > To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org%3cmailto:edk2-devel@lists.01.org>>
> > Cc: Wu, Hao A <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com<mailto:hao.a.wu@intel.com%3cmailto:hao.a.wu@intel.com>>>; Yao, Jiewen <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com<mailto:jiewen.yao@intel.com%3cmailto:jiewen.yao@intel.com>>>; Fan,
> > Jeff <jeff.fan@intel.com<mailto:jeff.fan@intel.com<mailto:jeff.fan@intel.com%3cmailto:jeff.fan@intel.com>>>; Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com%3cmailto:michael.d.kinney@intel.com>>>
> > Subject: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr
> > dereference
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com<mailto:jiewen.yao@intel.com%3cmailto:jiewen.yao@intel.com>>>
> > Cc: Jeff Fan <jeff.fan@intel.com<mailto:jeff.fan@intel.com<mailto:jeff.fan@intel.com%3cmailto:jeff.fan@intel.com>>>
> > Cc: Michael Kinney <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com%3cmailto:michael.d.kinney@intel.com>>>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Hao Wu <hao.a.wu@intel.com<mailto:hao.a.wu@intel.com<mailto:hao.a.wu@intel.com%3cmailto:hao.a.wu@intel.com>>>
> > ---
> > UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > index f4716f3..11fb891 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > @@ -1011,6 +1011,10 @@ GetUefiMemoryMap (
> > }
> > } while (Status == EFI_BUFFER_TOO_SMALL);
> >
> > + if (MemoryMap == NULL) {
> > + return ;
> > + }
> > +
> > SortMemoryMap (MemoryMap, UefiMemoryMapSize, mUefiDescriptorSize);
> > MergeMemoryMapForNotPresentEntry (MemoryMap,
> > &UefiMemoryMapSize, mUefiDescriptorSize);
> >
> > --
> > 1.9.5.msysgit.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-12-20 2:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-20 1:41 [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference Hao Wu
2016-12-20 1:42 ` Yao, Jiewen
2016-12-20 1:53 ` Kinney, Michael D
2016-12-20 2:02 ` Yao, Jiewen
2016-12-20 2:06 ` Yao, Jiewen
2016-12-20 2:23 ` Wu, Hao A
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox