lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 029/175] ACPICA: Dispatcher: add status checks
    Date
    From: Erik Kaneda <erik.kaneda@intel.com>

    [ Upstream commit 6bfe5344b2956d0bee116f1c640aef05e5cddd76 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/acpi/acpica/dsfield.c | 17 ++++++++++++-----
    1 file changed, 12 insertions(+), 5 deletions(-)

    diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
    index 8438e33aa447..fd9028a6bc20 100644
    --- a/drivers/acpi/acpica/dsfield.c
    +++ b/drivers/acpi/acpica/dsfield.c
    @@ -518,13 +518,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);
    }

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:13    [W:4.319 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site