48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
From 413fa91e9a7d28732c55589a7705ae68ec824494 Mon Sep 17 00:00:00 2001
|
|
From: ShenYage <shenyage1@huawei.com>
|
|
Date: Tue, 11 Jun 2024 14:57:58 +0800
|
|
Subject: [PATCH] MdeModulePkg: Potential UINT32 overflow in S3 ResumeCount
|
|
|
|
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4677
|
|
|
|
Attacker able to modify physical memory and ResumeCount.
|
|
System will crash/DoS when ResumeCount reaches its MAX_UINT32.
|
|
|
|
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
|
|
Cc: Dandan Bi <dandan.bi@intel.com>
|
|
Cc: Liming Gao <gaoliming@byosoft.com.cn>
|
|
|
|
Signed-off-by: Pakkirisamy ShanmugavelX <shanmugavelx.pakkirisamy@intel.com>
|
|
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
|
|
---
|
|
.../FirmwarePerformancePei.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c
|
|
index 2f2b2a8..2ba9215 100644
|
|
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c
|
|
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c
|
|
@@ -112,11 +112,15 @@ FpdtStatusCodeListenerPei (
|
|
//
|
|
S3ResumeTotal = MultU64x32 (AcpiS3ResumeRecord->AverageResume, AcpiS3ResumeRecord->ResumeCount);
|
|
AcpiS3ResumeRecord->ResumeCount++;
|
|
- AcpiS3ResumeRecord->AverageResume = DivU64x32 (S3ResumeTotal + AcpiS3ResumeRecord->FullResume, AcpiS3ResumeRecord->ResumeCount);
|
|
+ if (AcpiS3ResumeRecord->ResumeCount > 0) {
|
|
+ AcpiS3ResumeRecord->AverageResume = DivU64x32 (S3ResumeTotal + AcpiS3ResumeRecord->FullResume, AcpiS3ResumeRecord->ResumeCount);
|
|
+ DEBUG ((DEBUG_INFO, "\nFPDT: S3 Resume Performance - AverageResume = 0x%x\n", AcpiS3ResumeRecord->AverageResume));
|
|
+ } else {
|
|
+ DEBUG ((DEBUG_ERROR, "\nFPDT: S3 ResumeCount reaches the MAX_UINT32 value. S3 ResumeCount record reset to Zero."));
|
|
+ }
|
|
|
|
- DEBUG ((DEBUG_INFO, "FPDT: S3 Resume Performance - ResumeCount = %d\n", AcpiS3ResumeRecord->ResumeCount));
|
|
- DEBUG ((DEBUG_INFO, "FPDT: S3 Resume Performance - FullResume = %ld\n", AcpiS3ResumeRecord->FullResume));
|
|
- DEBUG ((DEBUG_INFO, "FPDT: S3 Resume Performance - AverageResume = %ld\n", AcpiS3ResumeRecord->AverageResume));
|
|
+ DEBUG ((DEBUG_INFO, "FPDT: S3 Resume Performance - ResumeCount = 0x%x\n", AcpiS3ResumeRecord->ResumeCount));
|
|
+ DEBUG ((DEBUG_INFO, "FPDT: S3 Resume Performance - FullResume = 0x%x\n", AcpiS3ResumeRecord->FullResume));
|
|
|
|
//
|
|
// Update S3 Suspend Performance Record.
|
|
--
|
|
2.33.0
|
|
|