diff options
| author | Ceping Sun <cepingx.sun@intel.com> | 2023-10-23 17:05:39 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-10-25 09:52:06 +0000 |
| commit | cf87fd95c1f5be4880a015c82a18e8ae12ff5e94 (patch) | |
| tree | 81167a635284bda2a775a10a21ea737b02d33805 | |
| parent | 170d4ce8e90abb1eff03852940a69c9d17f8afe5 (diff) | |
| download | edk2-cf87fd95c1f5be4880a015c82a18e8ae12ff5e94.tar.gz edk2-cf87fd95c1f5be4880a015c82a18e8ae12ff5e94.tar.bz2 edk2-cf87fd95c1f5be4880a015c82a18e8ae12ff5e94.zip | |
OvmfPkg/AcpiPlatformDxe: Fix Coverity report issues
v1 -> v2 Changed list:
1:Since both commits are intended to fix coverity issues, they are merged
into one
2:Changed the debug info level to debug error when "DsdtTable == NULL"
3:Add the Cc member as below
Erdem Aktas erdemaktas@google.com
James Bottomley jejb@linux.ibm.com
Tom Lendacky thomas.lendacky@amd.com
Michael Roth michael.roth@amd.com
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4568
The function InstallCloudHvTablesTdx had an Assert when "DsdtTable ==
NULL", but this comes into play only in DEBUG mode. In Release mode ,
there is no handling if the pointer is NULL. To avoid the possible null
pointer dereference, it is better to handle it when the pointer is null.
In addition, the status of "AcpiProtocol->InstallAcpiTable" is overwritten
before it can be used in the function, it is better to check it before
overwriting.
code: https://github.com/sunceping/edk2/tree/fixcoverityerrors.v2
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Michael Roth <michael.roth@amd.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Ceping Sun <cepingx.sun@intel.com>
Message-Id: <20231023090539.1003-1-cepingx.sun@intel.com>
Reviewed-by: Min Xu <min.m.xu@intel.com>
[lersek@redhat.com: rewrap commit message to placate PatchCheck.py]
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c b/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c index d3e73c155e..4629fa2603 100644 --- a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c @@ -53,6 +53,11 @@ InstallCloudHvTablesTdx ( CurrentTable->Length,
&TableHandle
);
+ if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
+ return Status;
+ }
+
for (UINTN i = 0; i < CurrentTable->Length; i++) {
DEBUG ((DEBUG_INFO, " %x", *((UINT8 *)CurrentTable + i)));
}
@@ -69,8 +74,9 @@ InstallCloudHvTablesTdx ( // then we're out of sync with the hypervisor, and cannot continue.
//
if (DsdtTable == NULL) {
- DEBUG ((DEBUG_INFO, "%a: no DSDT found\n", __func__));
+ DEBUG ((DEBUG_ERROR, "%a: no DSDT found\n", __func__));
ASSERT (FALSE);
+ CpuDeadLoop ();
}
Status = AcpiProtocol->InstallAcpiTable (
|