OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Coverity issues. (#1950) 

* fix: [Common] FwVendor/OemId Array compared against 0

Since it is an array the test evaluates as true and the check is
unnecessary.(CWE-398)

UINT8 FwVendor[EFI_ACPI_PSD_FW_VENDOR_SIZE];
UINT8 OemId[6];

Signed-off-by: Randy <randy.lin@intel.com>

* fix: [Common] Unchecked return value for HeciGetMeMode

If the function returns an error value, the error value
may be mistaken for a normal value.
In HeciSend: Value returned from a function is
not checked for errors before being used. (CWE-252)

Signed-off-by: Randy <randy.lin@intel.com>

---------

Signed-off-by: Randy <randy.lin@intel.com>
This commit is contained in:
randylintw 2023-07-11 02:52:25 +08:00 committed by GitHub
parent 1a46ef1771
commit 7f941e57a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 37 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Silicon/AlderlakePkg/Library/PsdLib/PsdLib.c
View File

@ -213,9 +213,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Revision = EFI_ACPI_PSD_TABLE_REVISION;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem (&mPsdt->Header.OemId, PSDS_EFI_ACPI_OEM_ID, sizeof(mPsdt->Header.OemId));
mPsdt->Header.OemTableId = PSDS_EFI_ACPI_OEM_TABLE_ID;
@ -244,9 +241,6 @@ UpdateAcpiPsdTable (
DEBUG((DEBUG_ERROR, " GetSecFwVersion failed =%x\n", Status));
}
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem (&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr ();

7
Silicon/ApollolakePkg/Library/PsdLib/PsdLib.c
View File

@ -211,9 +211,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Signature = EFI_ACPI_PSD_SIGNATURE;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->Header.OemId, EFI_ACPI_OEM_ID, 6);
mPsdt->Header.OemTableId = EFI_ACPI_OEM_TABLE_ID;
mPsdt->Header.OemRevision = EFI_ACPI_OEM_REVISION;
@ -256,9 +253,7 @@ UpdateAcpiPsdTable (
DEBUG( (DEBUG_INFO, "PSD Values: CodeMinor=%x\n", mPsdt->FwVer.CodeMinor ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeHotFix=%x\n", mPsdt->FwVer.CodeHotFix ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeBuildNo=%x \n", mPsdt->FwVer.CodeBuildNo ));
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr();
if (PlatformData == NULL) {

7
Silicon/CoffeelakePkg/Library/PsdLib/PsdLib.c
View File

@ -280,9 +280,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Signature = EFI_ACPI_PSD_SIGNATURE;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->Header.OemId, PSDS_EFI_ACPI_OEM_ID, 6);
mPsdt->Header.OemTableId = PSDS_EFI_ACPI_OEM_TABLE_ID;
mPsdt->Header.OemRevision = PSDS_EFI_ACPI_OEM_REVISION;
@ -328,9 +325,7 @@ UpdateAcpiPsdTable (
DEBUG( (DEBUG_INFO, "PSD Values: CodeMinor=%x\n", mPsdt->FwVer.CodeMinor ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeHotFix=%x\n", mPsdt->FwVer.CodeHotFix ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeBuildNo=%x \n", mPsdt->FwVer.CodeBuildNo ));
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr();
if (PlatformData == NULL) {

8
Silicon/CometlakePkg/Library/HeciLib/HeciCore.c
View File

@ -1041,7 +1041,13 @@ HeciSend (
}
}
HeciGetMeMode (&MeMode);
Status = HeciGetMeMode (&MeMode);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "ME Mode: %X\n", MeMode));
} else {
DEBUG ((DEBUG_INFO, "Failed to Get ME Mode!\n"));
return EFI_UNSUPPORTED;
}
if (MeMode == ME_MODE_SECOVER) {
return EFI_UNSUPPORTED;
}

7
Silicon/CometlakePkg/Library/PsdLib/PsdLib.c
View File

@ -280,9 +280,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Signature = EFI_ACPI_PSD_SIGNATURE;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->Header.OemId, PSDS_EFI_ACPI_OEM_ID, 6);
mPsdt->Header.OemTableId = PSDS_EFI_ACPI_OEM_TABLE_ID;
mPsdt->Header.OemRevision = PSDS_EFI_ACPI_OEM_REVISION;
@ -328,9 +325,7 @@ UpdateAcpiPsdTable (
DEBUG( (DEBUG_INFO, "PSD Values: CodeMinor=%x\n", mPsdt->FwVer.CodeMinor ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeHotFix=%x\n", mPsdt->FwVer.CodeHotFix ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeBuildNo=%x \n", mPsdt->FwVer.CodeBuildNo ));
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr();
if (PlatformData == NULL) {

8
Silicon/CometlakevPkg/Library/HeciLib/HeciCore.c
View File

@ -1041,7 +1041,13 @@ HeciSend (
}
}
HeciGetMeMode (&MeMode);
Status = HeciGetMeMode (&MeMode);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "ME Mode: %X\n", MeMode));
} else {
DEBUG ((DEBUG_INFO, "Failed to Get ME Mode!\n"));
return EFI_UNSUPPORTED;
}
if (MeMode == ME_MODE_SECOVER) {
return EFI_UNSUPPORTED;
}

7
Silicon/CometlakevPkg/Library/PsdLib/PsdLib.c
View File

@ -280,9 +280,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Signature = EFI_ACPI_PSD_SIGNATURE;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->Header.OemId, PSDS_EFI_ACPI_OEM_ID, 6);
mPsdt->Header.OemTableId = PSDS_EFI_ACPI_OEM_TABLE_ID;
mPsdt->Header.OemRevision = PSDS_EFI_ACPI_OEM_REVISION;
@ -329,9 +326,7 @@ UpdateAcpiPsdTable (
DEBUG( (DEBUG_INFO, "PSD Values: CodeMinor=%x\n", mPsdt->FwVer.CodeMinor ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeHotFix=%x\n", mPsdt->FwVer.CodeHotFix ));
DEBUG( (DEBUG_INFO, "PSD Values: CodeBuildNo=%x \n", mPsdt->FwVer.CodeBuildNo ));
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr();
if (PlatformData == NULL) {

8
Silicon/CommonSocPkg/Library/HeciLib/HeciCore.c
View File

@ -741,7 +741,13 @@ HeciSend (
return EFI_DEVICE_ERROR;
}
HeciGetMeMode (&MeMode);
Status = HeciGetMeMode (&MeMode);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "ME Mode: %X\n", MeMode));
} else {
DEBUG ((DEBUG_INFO, "Failed to Get ME Mode!\n"));
return EFI_UNSUPPORTED;
}
if (MeMode == ME_MODE_SECOVER) {
return EFI_UNSUPPORTED;
}

7
Silicon/ElkhartlakePkg/Library/HeciInitLib/HeciCore.c
View File

@ -914,7 +914,12 @@ HeciSend (
}
}
HeciGetMeMode (&MeMode);
Status = HeciGetMeMode (&MeMode);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "ME Mode: %X\n", MeMode));
} else {
DEBUG ((DEBUG_INFO, "Failed to Get ME Mode!\n"));
}
if (MeMode == ME_MODE_SECOVER) {
return EFI_UNSUPPORTED;
}

8
Silicon/ElkhartlakePkg/Library/PsdLib/PsdLib.c
View File

@ -181,9 +181,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Signature = EFI_ACPI_PSD_SIGNATURE;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->Header.OemId, PSDS_EFI_ACPI_OEM_ID, 6);
mPsdt->Header.OemTableId = PSDS_EFI_ACPI_OEM_TABLE_ID;
mPsdt->Header.OemRevision = PSDS_EFI_ACPI_OEM_REVISION;
@ -210,11 +207,6 @@ UpdateAcpiPsdTable (
if (EFI_ERROR(Status)) {
DEBUG((DEBUG_ERROR, " GetSecCFwVersion failed =%x\n",Status));
}
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr();
if (PlatformData == NULL) {

7
Silicon/TigerlakePchPkg/Library/HeciInitLib/HeciCore.c
View File

@ -909,7 +909,12 @@ HeciSend (
}
}
HeciGetMeMode (&MeMode);
Status = HeciGetMeMode (&MeMode);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "ME Mode: %X\n", MeMode));
} else {
DEBUG ((DEBUG_INFO, "Failed to Get ME Mode!\n"));
}
if (MeMode == ME_MODE_SECOVER) {
return EFI_UNSUPPORTED;
}

6
Silicon/TigerlakePkg/Library/PsdLib/PsdLib.c
View File

@ -163,9 +163,6 @@ UpdateAcpiPsdTable (
mPsdt->Header.Signature = EFI_ACPI_PSD_SIGNATURE;
mPsdt->Header.Checksum = 0;
if( &(mPsdt->Header.OemId) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->Header.OemId, PSDS_EFI_ACPI_OEM_ID, 6);
mPsdt->Header.OemTableId = PSDS_EFI_ACPI_OEM_TABLE_ID;
mPsdt->Header.OemRevision = PSDS_EFI_ACPI_OEM_REVISION;
@ -193,9 +190,6 @@ UpdateAcpiPsdTable (
if (EFI_ERROR(Status)) {
DEBUG((DEBUG_ERROR, " GetSecCFwVersion failed =%x\n",Status));
}
if( &(mPsdt->FwVendor) == NULL) {
return RETURN_BUFFER_TOO_SMALL;
}
CopyMem(&mPsdt->FwVendor, EFI_ACPI_PSD_FW_VENDOR, EFI_ACPI_PSD_FW_VENDOR_SIZE);
PlatformData = (PLATFORM_DATA *)GetPlatformDataPtr();
if (PlatformData == NULL) {