[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <149315024459.9151.4555045488194999231.stgit@dwillia2-desk3.amr.corp.intel.com>
Date: Tue, 25 Apr 2017 12:58:31 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: rafael.j.wysocki@...el.com
Cc: Anush Seetharaman <anush.seetharaman@...el.com>,
Tiffany Kasanicky <tiffany.j.kasanicky@...el.com>,
Ryon Jensen <ryon.jensen@...el.com>,
linux-kernel@...r.kernel.org, stable@...r.kernel.org,
linux-acpi@...r.kernel.org,
Kristin Jacque <kristin.jacque@...el.com>,
Zhang Rui <rui.zhang@...el.com>
Subject: [PATCH v2] acpi: fix acpi_get_table() leak / acpi-sysfs denial of
service
Reading an ACPI table through the /sys/firmware/acpi/tables interface
more than 65,536 times leads to the following log message:
ACPI Error: Table ffff88033595eaa8, Validation count is zero after increment
(20170119/tbutils-423)
...and the table being unavailable until the next reboot. Add the
missing acpi_put_table() so the table ->validation_count is decremented
after each read.
Cc: <stable@...r.kernel.org>
Cc: Zhang Rui <rui.zhang@...el.com>
Cc: Rafael Wysocki <rafael.j.wysocki@...el.com>
Cc: Kristin Jacque <kristin.jacque@...el.com>
Cc: Tiffany Kasanicky <tiffany.j.kasanicky@...el.com>
Cc: Ryon Jensen <ryon.jensen@...el.com>
Reported-by: Anush Seetharaman <anush.seetharaman@...el.com>
Fixes: 1c8fce27e275 ("ACPI: introduce drivers/acpi/sysfs.c")
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
Changes in v2:
* compile fix s/table/table_header/. Sorry, I forgot to do 'stg refresh'
before 'stg mail'
drivers/acpi/sysfs.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index cf05ae973381..5180fef9eb49 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -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,
Powered by blists - more mailing lists