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

["Yao, Jiewen" <jiewen.yao@intel.com>]

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