leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: sysfs: Prevent get_status() from returning acpi_status

Browse Source 
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>
This commit is contained in:
Rafael J. Wysocki
2019-03-12 10:30:29 +01:00
parent d276709ce6
commit 3fd16d7016
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/acpi/sysfs.c
View File

@@ -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) acpi_handle *handle)
{ {
int result; acpi_status status;
if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS) if (index >= num_gpes + ACPI_NUM_FIXED_EVENTS)
return -EINVAL; return -EINVAL;
if (index < num_gpes) { if (index < num_gpes) {
result = acpi_get_gpe_device(index, handle); status = acpi_get_gpe_device(index, handle);
if (result) { if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND, ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
"Invalid GPE 0x%x", index)); "Invalid GPE 0x%x", index));
return result; return -ENXIO;
} }
result = acpi_get_gpe_status(*handle, index, status); status = acpi_get_gpe_status(*handle, index, ret);
} else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS)) } else {
result = acpi_get_event_status(index - num_gpes, status); 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, static ssize_t counter_show(struct kobject *kobj,