Fix CVE-2023-45229、CVE-2023-45230、CVE-2023-45231、CVE-2023-45232、CVE-2023-45233、CVE-2023-45234、CVE-2023-45235 Signed-off-by: yexiao <yexiao7@huawei.com> (cherry picked from commit aa6a1dc11863945714f63746d5f1159ed3ede3e7)
61 lines
2.6 KiB
Diff
61 lines
2.6 KiB
Diff
From 7da4834de41ef7e9621d022546ac277fd24690f1 Mon Sep 17 00:00:00 2001
|
|
From: "Doug Flick via groups.io" <dougflick=microsoft.com@groups.io>
|
|
Date: Fri, 26 Jan 2024 05:54:54 +0800
|
|
Subject: [PATCH 12/19] MdePkg: Test: Add gRT_GetTime Google Test Mock
|
|
|
|
This adds support for GetTime Google Test Mock
|
|
|
|
Cc: Michael D Kinney <michael.d.kinney@intel.com>
|
|
Cc: Liming Gao <gaoliming@byosoft.com.cn>
|
|
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
|
|
|
|
Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
|
|
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
|
|
|
|
reference: https://github.com/tianocore/edk2/pull/5352
|
|
Signed-off-by: yexiao <yexiao7@huawei.com>
|
|
---
|
|
.../GoogleTest/Library/MockUefiRuntimeServicesTableLib.h | 7 +++++++
|
|
.../MockUefiRuntimeServicesTableLib.cpp | 3 ++-
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h
|
|
index afdfc6b8..57ec889e 100644
|
|
--- a/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h
|
|
+++ b/MdePkg/Test/Mock/Include/GoogleTest/Library/MockUefiRuntimeServicesTableLib.h
|
|
@@ -37,6 +37,13 @@ struct MockUefiRuntimeServicesTableLib {
|
|
IN UINTN DataSize,
|
|
IN VOID *Data)
|
|
);
|
|
+
|
|
+ MOCK_FUNCTION_DECLARATION (
|
|
+ EFI_STATUS,
|
|
+ gRT_GetTime,
|
|
+ (OUT EFI_TIME *Time,
|
|
+ OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL)
|
|
+ );
|
|
};
|
|
|
|
#endif
|
|
diff --git a/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp b/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp
|
|
index ecd1ba82..06121fc5 100644
|
|
--- a/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp
|
|
+++ b/MdePkg/Test/Mock/Library/GoogleTest/MockUefiRuntimeServicesTableLib/MockUefiRuntimeServicesTableLib.cpp
|
|
@@ -10,11 +10,12 @@ MOCK_INTERFACE_DEFINITION(MockUefiRuntimeServicesTableLib);
|
|
|
|
MOCK_FUNCTION_DEFINITION(MockUefiRuntimeServicesTableLib, gRT_GetVariable, 5, EFIAPI);
|
|
MOCK_FUNCTION_DEFINITION(MockUefiRuntimeServicesTableLib, gRT_SetVariable, 5, EFIAPI);
|
|
+MOCK_FUNCTION_DEFINITION (MockUefiRuntimeServicesTableLib, gRT_GetTime, 2, EFIAPI);
|
|
|
|
static EFI_RUNTIME_SERVICES localRt = {
|
|
{0}, // EFI_TABLE_HEADER
|
|
|
|
- NULL, // EFI_GET_TIME
|
|
+ gRT_GetTime, // EFI_GET_TIME
|
|
NULL, // EFI_SET_TIME
|
|
NULL, // EFI_GET_WAKEUP_TIME
|
|
NULL, // EFI_SET_WAKEUP_TIME
|
|
--
|
|
2.33.0
|
|
|