From 61959fa9baeed976adefa2043390f2ad208d894e Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Wed, 10 Dec 2014 08:21:05 +0000 Subject: [PATCH] Fix potential NULL pointer dereference issue in TcgDxe & TreeDxe. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chao Zhang Reviewed-by: Guo Dong git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16494 6f19259b-4bc3-4df7-8a09-765794883524 --- SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 2 +- SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c index bf9c7521aa..282505dbc7 100644 --- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c +++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c @@ -1021,7 +1021,7 @@ MeasureAllBootVariables ( &BootCount, (VOID **) &BootOrder ); - if (Status == EFI_NOT_FOUND) { + if (Status == EFI_NOT_FOUND || BootOrder == NULL) { return EFI_SUCCESS; } diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c index 2f159e0c6b..54e505d136 100644 --- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c +++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c @@ -1245,7 +1245,7 @@ MeasureVariable ( VarName, VarNameLength * sizeof (*VarName) ); - if (VarSize != 0) { + if (VarSize != 0 && VarData != NULL) { CopyMem ( (CHAR16 *)VarLog->UnicodeName + VarNameLength, VarData, @@ -1423,7 +1423,7 @@ MeasureAllBootVariables ( &BootCount, (VOID **) &BootOrder ); - if (Status == EFI_NOT_FOUND) { + if (Status == EFI_NOT_FOUND || BootOrder == NULL) { return EFI_SUCCESS; }