ACPICA: Dispatcher: add status checks
authorErik Kaneda <erik.kaneda@intel.com>
Tue, 5 May 2020 00:46:52 +0000 (17:46 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 9 May 2020 08:55:54 +0000 (10:55 +0200)
ACPICA commit 3244c1eeba9f9fb9ccedb875f7923a3d85e0c6aa

The status chekcs are used to to avoid NULL pointer dereference on
field objects

Link: https://github.com/acpica/acpica/commit/3244c1ee
Reported-by: Kurt Kennett <kurt_kennett@hotmail.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/dsfield.c

index 0189b5d4e3a306b9c94c50b86fcb12ee3c5250b8..fa768b3a989e962ff15a4bfa50a3cdbc2c1c521a 100644 (file)
@@ -517,13 +517,20 @@ acpi_ds_create_field(union acpi_parse_object *op,
        info.region_node = region_node;
 
        status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
        if (info.region_node->object->region.space_id ==
-           ACPI_ADR_SPACE_PLATFORM_COMM
-           && !(region_node->object->field.internal_pcc_buffer =
-                ACPI_ALLOCATE_ZEROED(info.region_node->object->region.
-                                     length))) {
-               return_ACPI_STATUS(AE_NO_MEMORY);
+           ACPI_ADR_SPACE_PLATFORM_COMM) {
+               region_node->object->field.internal_pcc_buffer =
+                   ACPI_ALLOCATE_ZEROED(info.region_node->object->region.
+                                        length);
+               if (!region_node->object->field.internal_pcc_buffer) {
+                       return_ACPI_STATUS(AE_NO_MEMORY);
+               }
        }
+
        return_ACPI_STATUS(status);
 }