]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects
authorvoid0red <30990023+void0red@users.noreply.github.com>
Wed, 5 Apr 2023 13:57:57 +0000 (15:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 May 2023 16:32:35 +0000 (17:32 +0100)
[ 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>
drivers/acpi/acpica/dbnames.c

index 3615e1a6efd8ae084b4f0961b4083e7ea754bd54..b91155ea9c343cd82871b3dc0638a2143a0f11bf 100644 (file)
@@ -652,6 +652,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,