From: Michael Kubacki <michael.kuba...@microsoft.com>
This change recognizes the condition of the DEPEX version string
extending beyond the end of the dependency expression as an error.
Cc: Liming Gao <liming....@intel.com>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Cc: Guomin Jiang <guomin.ji...@intel.com>
Cc: Wei6 Xu <wei6...@intel.com>
Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com>
Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com>
Reviewed-by: Guomin Jiang <guomin.ji...@intel.com>
Reviewed-by: Wei6 Xu <wei6...@intel.com>
---
Notes:
This is particularly helpful for the user to isolate the issue
when stepping through the control flow as this case will be the
last executed before jumping to the Error label to return from
the function.
FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c
b/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c
index ba89eb22d9f0..5ef25d2415cf 100644
--- a/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c
+++ b/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c
@@ -286,6 +286,7 @@ EvaluateDependency (
Iterator += AsciiStrnLenS ((CHAR8 *) Iterator, DependenciesSize -
(Iterator - Dependencies->Dependencies));
if (Iterator == (UINT8 *) Dependencies->Dependencies + DependenciesSize)
{
DEBUG ((DEBUG_ERROR, "EvaluateDependency: STRING extends beyond end of
dependency expression!\n"));
+ goto Error;
}
break;
case EFI_FMP_DEP_AND:
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#63744): https://edk2.groups.io/g/devel/message/63744
Mute This Topic: https://groups.io/mt/76016856/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
