From 7f941e57a25eaeee80ad95949a1578dc2adf87f6 Mon Sep 17 00:00:00 2001 From: randylintw Date: Tue, 11 Jul 2023 02:52:25 +0800 Subject: [PATCH] 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 * 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 --------- Signed-off-by: Randy --- Silicon/AlderlakePkg/Library/PsdLib/PsdLib.c | 6 ------ Silicon/ApollolakePkg/Library/PsdLib/PsdLib.c | 7 +------ Silicon/CoffeelakePkg/Library/PsdLib/PsdLib.c | 7 +------ Silicon/CometlakePkg/Library/HeciLib/HeciCore.c | 8 +++++++- Silicon/CometlakePkg/Library/PsdLib/PsdLib.c | 7 +------ Silicon/CometlakevPkg/Library/HeciLib/HeciCore.c | 8 +++++++- Silicon/CometlakevPkg/Library/PsdLib/PsdLib.c | 7 +------ Silicon/CommonSocPkg/Library/HeciLib/HeciCore.c | 8 +++++++- Silicon/ElkhartlakePkg/Library/HeciInitLib/HeciCore.c | 7 ++++++- Silicon/ElkhartlakePkg/Library/PsdLib/PsdLib.c | 8 -------- Silicon/TigerlakePchPkg/Library/HeciInitLib/HeciCore.c | 7 ++++++- Silicon/TigerlakePkg/Library/PsdLib/PsdLib.c | 6 ------ 12 files changed, 37 insertions(+), 49 deletions(-) diff --git a/Silicon/AlderlakePkg/Library/PsdLib/PsdLib.c b/Silicon/AlderlakePkg/Library/PsdLib/PsdLib.c index 19bd89bf..ef8b9d3a 100644 --- a/Silicon/AlderlakePkg/Library/PsdLib/PsdLib.c +++ b/Silicon/AlderlakePkg/Library/PsdLib/PsdLib.c @@ -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 (); diff --git a/Silicon/ApollolakePkg/Library/PsdLib/PsdLib.c b/Silicon/ApollolakePkg/Library/PsdLib/PsdLib.c index 9b4b83cb..ba16a469 100644 --- a/Silicon/ApollolakePkg/Library/PsdLib/PsdLib.c +++ b/Silicon/ApollolakePkg/Library/PsdLib/PsdLib.c @@ -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) { diff --git a/Silicon/CoffeelakePkg/Library/PsdLib/PsdLib.c b/Silicon/CoffeelakePkg/Library/PsdLib/PsdLib.c index 1b1d0cd9..c15ce727 100644 --- a/Silicon/CoffeelakePkg/Library/PsdLib/PsdLib.c +++ b/Silicon/CoffeelakePkg/Library/PsdLib/PsdLib.c @@ -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) { diff --git a/Silicon/CometlakePkg/Library/HeciLib/HeciCore.c b/Silicon/CometlakePkg/Library/HeciLib/HeciCore.c index 919ed15f..a425efb9 100644 --- a/Silicon/CometlakePkg/Library/HeciLib/HeciCore.c +++ b/Silicon/CometlakePkg/Library/HeciLib/HeciCore.c @@ -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; } diff --git a/Silicon/CometlakePkg/Library/PsdLib/PsdLib.c b/Silicon/CometlakePkg/Library/PsdLib/PsdLib.c index 3dc9341c..1a5a9742 100644 --- a/Silicon/CometlakePkg/Library/PsdLib/PsdLib.c +++ b/Silicon/CometlakePkg/Library/PsdLib/PsdLib.c @@ -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) { diff --git a/Silicon/CometlakevPkg/Library/HeciLib/HeciCore.c b/Silicon/CometlakevPkg/Library/HeciLib/HeciCore.c index 919ed15f..a425efb9 100644 --- a/Silicon/CometlakevPkg/Library/HeciLib/HeciCore.c +++ b/Silicon/CometlakevPkg/Library/HeciLib/HeciCore.c @@ -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; } diff --git a/Silicon/CometlakevPkg/Library/PsdLib/PsdLib.c b/Silicon/CometlakevPkg/Library/PsdLib/PsdLib.c index 7b988c44..a13c5614 100644 --- a/Silicon/CometlakevPkg/Library/PsdLib/PsdLib.c +++ b/Silicon/CometlakevPkg/Library/PsdLib/PsdLib.c @@ -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) { diff --git a/Silicon/CommonSocPkg/Library/HeciLib/HeciCore.c b/Silicon/CommonSocPkg/Library/HeciLib/HeciCore.c index 878a6355..0a8e0c34 100644 --- a/Silicon/CommonSocPkg/Library/HeciLib/HeciCore.c +++ b/Silicon/CommonSocPkg/Library/HeciLib/HeciCore.c @@ -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; } diff --git a/Silicon/ElkhartlakePkg/Library/HeciInitLib/HeciCore.c b/Silicon/ElkhartlakePkg/Library/HeciInitLib/HeciCore.c index 03f16241..812ff91f 100644 --- a/Silicon/ElkhartlakePkg/Library/HeciInitLib/HeciCore.c +++ b/Silicon/ElkhartlakePkg/Library/HeciInitLib/HeciCore.c @@ -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; } diff --git a/Silicon/ElkhartlakePkg/Library/PsdLib/PsdLib.c b/Silicon/ElkhartlakePkg/Library/PsdLib/PsdLib.c index 4181d21c..6934dbaf 100644 --- a/Silicon/ElkhartlakePkg/Library/PsdLib/PsdLib.c +++ b/Silicon/ElkhartlakePkg/Library/PsdLib/PsdLib.c @@ -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) { diff --git a/Silicon/TigerlakePchPkg/Library/HeciInitLib/HeciCore.c b/Silicon/TigerlakePchPkg/Library/HeciInitLib/HeciCore.c index 71fbc0eb..a38812a8 100644 --- a/Silicon/TigerlakePchPkg/Library/HeciInitLib/HeciCore.c +++ b/Silicon/TigerlakePchPkg/Library/HeciInitLib/HeciCore.c @@ -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; } diff --git a/Silicon/TigerlakePkg/Library/PsdLib/PsdLib.c b/Silicon/TigerlakePkg/Library/PsdLib/PsdLib.c index b551f396..28c462ba 100644 --- a/Silicon/TigerlakePkg/Library/PsdLib/PsdLib.c +++ b/Silicon/TigerlakePkg/Library/PsdLib/PsdLib.c @@ -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) {