linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dan Williams <dan.j.williams@intel.com>
To: rafael.j.wysocki@intel.com
Cc: Anush Seetharaman <anush.seetharaman@intel.com>,
	Tiffany Kasanicky <tiffany.j.kasanicky@intel.com>,
	Ryon Jensen <ryon.jensen@intel.com>,
	linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	linux-acpi@vger.kernel.org,
	Kristin Jacque <kristin.jacque@intel.com>,
	Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH v2] acpi: fix acpi_get_table() leak / acpi-sysfs denial of service
Date: Tue, 25 Apr 2017 12:58:31 -0700	[thread overview]
Message-ID: <149315024459.9151.4555045488194999231.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)

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@vger.kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Rafael Wysocki <rafael.j.wysocki@intel.com>
Cc: Kristin Jacque <kristin.jacque@intel.com>
Cc: Tiffany Kasanicky <tiffany.j.kasanicky@intel.com>
Cc: Ryon Jensen <ryon.jensen@intel.com>
Reported-by: Anush Seetharaman <anush.seetharaman@intel.com>
Fixes: 1c8fce27e275 ("ACPI: introduce drivers/acpi/sysfs.c")
Signed-off-by: Dan Williams <dan.j.williams@intel.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,

             reply	other threads:[~2017-04-25 20:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-25 19:58 Dan Williams [this message]
2017-04-26 22:25 ` [PATCH v2] acpi: fix acpi_get_table() leak / acpi-sysfs denial of service Rafael J. Wysocki
2017-04-26 22:37   ` Dan Williams
2017-05-24 19:01     ` Dan Williams
2017-04-27  6:49   ` Zheng, Lv
2017-04-27 14:48     ` Dan Williams
2017-04-28  0:31       ` Rafael J. Wysocki
2017-04-28  1:13       ` Zheng, Lv

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=149315024459.9151.4555045488194999231.stgit@dwillia2-desk3.amr.corp.intel.com \
    --to=dan.j.williams@intel.com \
    --cc=anush.seetharaman@intel.com \
    --cc=kristin.jacque@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=rui.zhang@intel.com \
    --cc=ryon.jensen@intel.com \
    --cc=stable@vger.kernel.org \
    --cc=tiffany.j.kasanicky@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).