Skip to content

Commit

Permalink
ACPI: sysfs: Prevent get_status() from returning acpi_status
Browse files Browse the repository at this point in the history
The return value of get_status() is passed to user space on errors,
so it should not return acpi_status values then.  Make it return
error values that are meaningful for user space instead.

This also makes a Clang warning regarding the initialization of a
local variable in get_status() go away.

Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Mar 12, 2019
1 parent d276709 commit 3fd16d7
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions drivers/acpi/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -648,26 +648,29 @@ static void acpi_global_event_handler(u32 event_type, acpi_handle device,
}
}

static int get_status(u32 index, acpi_event_status *status,
static int get_status(u32 index, acpi_event_status *ret,
acpi_handle *handle)
{
int result;
acpi_status status;

if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS)
return -EINVAL;

if (index < num_gpes) {
result = acpi_get_gpe_device(index, handle);
if (result) {
status = acpi_get_gpe_device(index, handle);
if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
"Invalid GPE 0x%x", index));
return result;
return -ENXIO;
}
result = acpi_get_gpe_status(*handle, index, status);
} else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS))
result = acpi_get_event_status(index - num_gpes, status);
status = acpi_get_gpe_status(*handle, index, ret);
} else {
status = acpi_get_event_status(index - num_gpes, ret);
}
if (ACPI_FAILURE(status))
return -EIO;

return result;
return 0;
}

static ssize_t counter_show(struct kobject *kobj,
Expand Down

0 comments on commit 3fd16d7

Please sign in to comment.