ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects

[ Upstream commit ae5a0eccc85fc960834dd66e3befc2728284b86c ]

ACPICA commit 0d5f467d6a0ba852ea3aad68663cbcbd43300fd4

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

Link: https://github.com/acpica/acpica/commit/0d5f467d
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c
index 8c207c7725179732059e65a44afb46b4eb2432e6..658fd7cfbd6cda0423a9973c387a355411c4a961 100644 (file)
--- a/drivers/acpi/acpica/dbnames.c
+++ b/drivers/acpi/acpica/dbnames.c
@@ -600,6 +600,9 @@ acpi_status acpi_db_display_objects(char *obj_type_arg, char *display_count_arg)
                object_info =
                    ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_object_info));
 
+               if (!object_info)
+                       return (AE_NO_MEMORY);
+
                /* Walk the namespace from the root */
 
                (void)acpi_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,