From: Dimitrije Pavlov <dimitrije.pavlov@arm.com>
Date: Tue, 16 Aug 2022 20:28:36 +0000 (-0500)
Subject: OvmfPkg/VirtioGpuDxe: Check QueryMode arguments
X-Git-Tag: edk2-stable202208~19
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b94836b2241c16c74d70d7bb2ae478f7750655bc;p=mirror_edk2.git

OvmfPkg/VirtioGpuDxe: Check QueryMode arguments

The current implementation does not check if Info or SizeInfo
pointers are 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 <Dimitrije.Pavlov@arm.com>
Reviewed-by: Sunny Wang <sunny.wang@arm.com>
---

diff --git a/OvmfPkg/VirtioGpuDxe/Gop.c b/OvmfPkg/VirtioGpuDxe/Gop.c
index 401db47672..16e92830d4 100644
--- a/OvmfPkg/VirtioGpuDxe/Gop.c
+++ b/OvmfPkg/VirtioGpuDxe/Gop.c
@@ -308,7 +308,10 @@ GopQueryMode (
 {
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *GopModeInfo;
 
-  if (ModeNumber >= This->Mode->MaxMode) {
+  if ((Info == NULL) ||
+      (SizeOfInfo == NULL) ||
+      (ModeNumber >= This->Mode->MaxMode))
+  {
     return EFI_INVALID_PARAMETER;
   }