From 4d4547cf13cca820ff7e0f859ba83e1a610b9fd0 Mon Sep 17 00:00:00 2001
From: Huai-Yuan Liu <qq810974084@gmail.com>
Date: Tue, 4 Jun 2024 11:52:15 +0000
Subject: [PATCH] check null return of ACPI_ALLOCATE_ZEROED in

AcpiDbConvertToPackage ACPI_ALLOCATE_ZEROED may fails, Elements
might be null and will cause null pointer dereference later.

Signed-off-by: Huai-Yuan Liu <qq810974084@gmail.com>

CVE: CVE-2024-24856
Upstream-Status: Backport [https://github.com/acpica/acpica/commit/4d4547cf13cca820ff7e0f859ba83e1a610b9fd0]

Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
 source/components/debugger/dbconvert.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/components/debugger/dbconvert.c b/source/components/debugger/dbconvert.c
index 55307d0..c17a5ab 100644
--- a/source/components/debugger/dbconvert.c
+++ b/source/components/debugger/dbconvert.c
@@ -354,6 +354,8 @@ AcpiDbConvertToPackage (

     Elements = ACPI_ALLOCATE_ZEROED (
         DB_DEFAULT_PKG_ELEMENTS * sizeof (ACPI_OBJECT));
+    if (!Elements)
+        return (AE_NO_MEMORY);

     This = String;
     for (i = 0; i < (DB_DEFAULT_PKG_ELEMENTS - 1); i++)
--
2.40.0
