From 30d62f5e3170c01f3331677894f80415eec92f23 Mon Sep 17 00:00:00 2001 From: Dimitrije Pavlov Date: Tue, 16 Aug 2022 15:28:35 -0500 Subject: [PATCH 1/1] OvmfPkg/PlatformDxe: Check ExtractConfig and RouteConfig arguments The current implementation does not check if Progress or Results pointers in ExtractConfig are NULL, or if Progress pointer in RouteConfig is NULL. This causes the SCT test suite to crash. Add a check to return EFI_INVALID_PARAMETER if any of these pointers are NULL. Signed-off-by: Dimitrije Pavlov Reviewed-by: Sunny Wang --- OvmfPkg/PlatformDxe/Platform.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index 4bf22712c7..a6d459f3df 100644 --- a/OvmfPkg/PlatformDxe/Platform.c +++ b/OvmfPkg/PlatformDxe/Platform.c @@ -232,6 +232,10 @@ ExtractConfig ( DEBUG ((DEBUG_VERBOSE, "%a: Request=\"%s\"\n", __FUNCTION__, Request)); + if ((Progress == NULL) || (Results == NULL)) { + return EFI_INVALID_PARAMETER; + } + Status = PlatformConfigToFormState (&MainFormState); if (EFI_ERROR (Status)) { *Progress = Request; @@ -340,6 +344,10 @@ RouteConfig ( Configuration )); + if (Progress == NULL) { + return EFI_INVALID_PARAMETER; + } + // // the "read" step in RMW // -- 2.39.2