diff options
| author | James Lu <james.lu@intel.com> | 2022-08-23 11:13:55 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-08-23 04:03:01 +0000 |
| commit | dfdba857a6b6a708e754ddb1a04086a3402acdef (patch) | |
| tree | 42560818974e60d050329d0701a1d2d31fe0e78b /UefiPayloadPkg | |
| parent | f2bf043aaac7107a8ed1c0060c838d1e032e077f (diff) | |
| download | edk2-dfdba857a6b6a708e754ddb1a04086a3402acdef.tar.gz edk2-dfdba857a6b6a708e754ddb1a04086a3402acdef.tar.bz2 edk2-dfdba857a6b6a708e754ddb1a04086a3402acdef.zip | |
UefiPayloadPkg: Fix Coverity report defect
https://bugzilla.tianocore.org/show_bug.cgi?id=4018
Coverity report FORWARD_NULL and OVERFLOW_BEFORE_WIDEN potential defect
in UefiPayloadPkg.
Signed-off-by: Gregx Yeh <gregx.yeh@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: James Lu <james.lu@intel.com>
Diffstat (limited to 'UefiPayloadPkg')
| -rw-r--r-- | UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 4 | ||||
| -rw-r--r-- | UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c | 2 | ||||
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c index 9847063d3d..790e6109c0 100644 --- a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -232,11 +232,11 @@ PciHostBridgeFreeRootBridges ( UINTN Count
)
{
- if ((Bridges == NULL) && (Count == 0)) {
+ if ((Bridges == NULL) || (Count == 0)) {
return;
}
- ASSERT (Bridges != NULL && Count > 0);
+ ASSERT (Bridges != NULL || Count > 0);
do {
--Count;
diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c index 2a6305c67b..a9bf6f3223 100644 --- a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c @@ -149,7 +149,7 @@ CalculateElfFileSize ( FileSize2 = Elf32Hdr->e_shoff + Elf32Hdr->e_shentsize * Elf32Hdr->e_shnum;
} else if (ElfCt->EiClass == ELFCLASS64) {
Elf64Hdr = (Elf64_Ehdr *)ElfCt->FileBase;
- FileSize2 = (UINTN)(Elf64Hdr->e_shoff + Elf64Hdr->e_shentsize * Elf64Hdr->e_shnum);
+ FileSize2 = ((UINTN)Elf64Hdr->e_shoff + (UINTN)(Elf64Hdr->e_shentsize * Elf64Hdr->e_shnum));
}
*FileSize = MAX (FileSize1, FileSize2);
diff --git a/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c b/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c index a586941352..1899404b24 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c +++ b/UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c @@ -778,9 +778,9 @@ CreateIdentityMappingPageTables ( // Pre-allocate big pages to avoid later allocations.
//
if (!Page1GSupport) {
- TotalPagesNum = ((NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;
+ TotalPagesNum = (UINTN)((NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;
} else {
- TotalPagesNum = (NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;
+ TotalPagesNum = (UINTN)(NumberOfPml4EntriesNeeded + 1) * NumberOfPml5EntriesNeeded + 1;
}
//
|