Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fd16d70 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: sysfs: Prevent get_status() from returning acpi_status 



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: default avatarNathan Chancellor <natechancellor@gmail.com>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d276709c

drivers/acpi/sysfs.c

+12 −9
Original line number Original line Diff line number Diff line
@@ -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;

		}

		status = acpi_get_gpe_status(*handle, index, ret);

	} else {

		status = acpi_get_event_status(index - num_gpes, ret);

	}

	}

		result = acpi_get_gpe_status(*handle, index, status);

	if (ACPI_FAILURE(status))

	} else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS))

		return -EIO;

		result = acpi_get_event_status(index - num_gpes, status);





	return result;

	return 0;

}

}





static ssize_t counter_show(struct kobject *kobj,

static ssize_t counter_show(struct kobject *kobj,