Re: [PATCH v2] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid NULL ptr dereference

["Wu, Hao A" <hao.a.wu@intel.com>]

Got it. I will remove those debug messages before check-in.

Best Regards,
Hao Wu


> -----Original Message-----
> From: Yao, Jiewen
> Sent: Tuesday, December 20, 2016 10:35 AM
> To: Wu, Hao A; edk2-devel@lists.01.org
> Cc: Fan, Jeff; Kinney, Michael D
> Subject: RE: [PATCH v2] UefiCpuPkg/PiSmmCpuDxeSmm: Add check to avoid
> NULL ptr dereference
> 
> Thanks.
> 
> This function will be called in SMM exception handlers. The exception info will
> be displayed later.
> There is no need to add debug message here. Please remove it.
> 
> With that change, reviewed-by: Jiewen.yao@intel.com
> 
> > -----Original Message-----
> > From: Wu, Hao A
> > Sent: Tuesday, December 20, 2016 10:22 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 v2] 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 | 11
> > +++++++++++
> >  1 file changed, 11 insertions(+)
> >
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
> > index f4716f3..d967255 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);
> >
> > @@ -1080,6 +1084,13 @@ IsSmmCommBufferForbiddenAddress (
> >    UINTN                 MemoryMapEntryCount;
> >    UINTN                 Index;
> >
> > +  DEBUG ((DEBUG_INFO, "IsSmmCommBufferForbiddenAddress\n"));
> > +
> > +  if (mUefiMemoryMap == NULL) {
> > +    DEBUG ((DEBUG_INFO, "UefiMemoryMap - NULL\n"));
> > +    return FALSE;
> > +  }
> > +
> >    MemoryMap = mUefiMemoryMap;
> >    MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;
> >    for (Index = 0; Index < MemoryMapEntryCount; Index++) {
> > --
> > 1.9.5.msysgit.0