tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/DxeCapsuleLibFmp: Add missing NULL pointer check. 

Add missing NULL pointer check for CapsuleNameBufStart.
Also add comments to notice that capsule name integrity check assumes
the capsule has been validated by IsValidCapsuleHeader().

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Chao B Zhang <chao.b.zhang@intel.com>
Signed-off-by: Wei6 Xu <wei6.xu@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Chao B Zhang <chao.b.zhang@intel.com>
This commit is contained in:
Wei6 Xu 2019-06-27 16:43:06 +08:00 committed by Zhang, Chao B
parent 104a1aa19b
commit fda8482df7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
View File

@ -25,6 +25,9 @@ IsCapsuleNameCapsule (
Check the integrity of the capsule name capsule. Check the integrity of the capsule name capsule.
If the capsule is vaild, return the physical address of each capsule name string. If the capsule is vaild, return the physical address of each capsule name string.
This routine assumes the capsule has been validated by IsValidCapsuleHeader(), so
capsule memory overflow is not going to happen in this routine.
@param[in] CapsuleHeader Pointer to the capsule header of a capsule name capsule. @param[in] CapsuleHeader Pointer to the capsule header of a capsule name capsule.
@param[out] CapsuleNameNum Number of capsule name. @param[out] CapsuleNameNum Number of capsule name.
@ -65,6 +68,9 @@ ValidateCapsuleNameCapsuleIntegrity (
// //
if (((UINTN) CapsuleNameBufStart & BIT0) != 0) { if (((UINTN) CapsuleNameBufStart & BIT0) != 0) {
CapsuleNameBufStart = AllocateCopyPool (CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize, CapsuleNameBufStart); CapsuleNameBufStart = AllocateCopyPool (CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize, CapsuleNameBufStart);
if (CapsuleNameBufStart == NULL) {
return NULL;
}
} }
CapsuleNameBufEnd = CapsuleNameBufStart + CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize; CapsuleNameBufEnd = CapsuleNameBufStart + CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize;