Skip to contentSkip to conversation

ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects

PATCH In review Kang Chen 3 participants 3 messages Feb 26, 2023 – Apr 10, 2023

Subsystems (2)
lore
Share & tools
lore

Kang Chen

author
#0 lore raw

PATCH 1/1 ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects

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

---
 drivers/acpi/acpica/dbnames.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/acpi/acpica/dbnames.c +3 -0
index 3615e1a6e..b91155ea9 100644
@@ -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,
Signature · 1 line
2.34.1
#1 lore raw
Quoted 5 lines · Kang Chen

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

As a rule, ACPICA changes need to be submitted as pull requests to the upstream ACPICA project on GitHub in the first place.

When this happens, please resend the patch with a Link tag pointing to the corresponding upstream pull request.

Quoted 21 lines
---
 drivers/acpi/acpica/dbnames.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/acpi/acpica/dbnames.c +3 -1
index 3615e1a6e..b91155ea9 100644
@@ -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,
--

2.34.1

#2 lore raw

PATCH v2 1/1 ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects

From: Kang Chen <[email protected]>

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

---
v2 -> v1: add a github link

 drivers/acpi/acpica/dbnames.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/acpi/acpica/dbnames.c +3 -0
index 3615e1a6e..b91155ea9 100644
@@ -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,
Signature · 1 line
2.34.1