From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.3128.1660575781920971510 for ; Mon, 15 Aug 2022 08:03:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: dimitrije.pavlov@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 74215106F; Mon, 15 Aug 2022 08:03:02 -0700 (PDT) Received: from mammon-apollo-f36.austin.arm.com (mammon-apollo-f36.austin.arm.com [10.118.12.61]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8A8963F66F; Mon, 15 Aug 2022 08:03:01 -0700 (PDT) From: "Dimitrije Pavlov" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jiewen Yao , Sunny Wang , Jeff Booher-Kaeding , Samer El-Haj-Mahmoud Subject: [PATCH v1 1/1] OvmfPkg/PlatformDxe: Check ExtractConfig and RouteConfig arguments Date: Mon, 15 Aug 2022 10:02:55 -0500 Message-Id: <20220815150255.2874134-1-dimitrije.pavlov@arm.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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. Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Sunny Wang Cc: Jeff Booher-Kaeding Cc: Samer El-Haj-Mahmoud Signed-off-by: Dimitrije Pavlov --- OvmfPkg/PlatformDxe/Platform.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index 4bf22712c78f..d7be2ab65efa 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.37.1