Merge tag 'acpi-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (104c08ba) · Commits · 戴 / test

Pull ACPI fixes from Rafael Wysocki: "These revert one more problematic commit related to the ACPI-based handling of laptop lids and make some unuseful error messages coming from ACPICA go away. Specifics: - Revert one more commit related to the ACPI-based handling of laptop lids that changed the default behavior on laptops that booted with closed lids and introduced a regression there (Benjamin Tissoires). - Add a missing acpi_put_table() to the code implementing the /sys/firmware/acpi/tables interface to prevent a counter in the ACPICA core from overflowing (Dan Williams). - Drop error messages printed by ACPICA on acpi_get_table() reference counting mismatches as they need not indicate real errors at this point (Lv Zheng)" * tag 'acpi-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPICA: Tables: Fix regression introduced by a too early mechanism enabling Revert "ACPI / button: Change default behavior to lid_init_state=open" ACPI / sysfs: fix acpi_get_table() leak / acpi-sysfs denial of service

drivers/acpi/acpica/tbutils.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -418,11 +418,7 @@ acpi_tb_get_table(struct acpi_table_desc *table_desc,

		table_desc->validation_count++;
		if (table_desc->validation_count == 0) {
		ACPI_ERROR((AE_INFO,
		"Table %p, Validation count is zero after increment\n",
		table_desc));
		table_desc->validation_count--;
		return_ACPI_STATUS(AE_LIMIT);
		}

		*out_table = table_desc->pointer;

drivers/acpi/button.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ struct acpi_button {

		static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
		static struct acpi_device *lid_device;
		static u8 lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;
		static u8 lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;

		static unsigned long lid_report_interval __read_mostly = 500;
		module_param(lid_report_interval, ulong, 0644);

drivers/acpi/sysfs.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -333,14 +333,17 @@ static ssize_t acpi_table_show(struct file filp, struct kobject kobj,
		container_of(bin_attr, struct acpi_table_attr, attr);
		struct acpi_table_header *table_header = NULL;
		acpi_status status;
		ssize_t rc;

		status = acpi_get_table(table_attr->name, table_attr->instance,
		&table_header);
		if (ACPI_FAILURE(status))
		return -ENODEV;

		return memory_read_from_buffer(buf, count, &offset,
		table_header, table_header->length);
		rc = memory_read_from_buffer(buf, count, &offset, table_header,
		table_header->length);
		acpi_put_table(table_header);
		return rc;
		}

		static int acpi_table_attr_init(struct kobject *tables_obj,

Admin message