From: "Pali Rohár" <pali.rohar@gmail.com>
To: Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>,
Andy Lutomirski <luto@kernel.org>
Cc: platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, "Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH] RFC: platform/x86: wmi: Fix check for method instance number
Date: Sat, 27 May 2017 13:55:34 +0200 [thread overview]
Message-ID: <1495886134-8276-1-git-send-email-pali.rohar@gmail.com> (raw)
instance_count defines number of instances of data block and instance
itself is indexed from zero, which means first instance has number 0.
Therefore check for invalid instance should be non-strict inequality.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
I'm marking this patch as RFC because it is not tested at all and probably
could break existing WMI drivers. Some WMI drivers pass instance number 1
and I'm not sure if ACPI-WMI bytecode for those machines has really two
instances. In more cases ACPI-WMI bytecode does not check instance number
if supports only one instance. So then any instance id can be used for
correct execution of ACPI-WMI method.
So this patch is open for discussion.
---
drivers/platform/x86/wmi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index cd7045f..df63037 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -191,7 +191,7 @@ acpi_status wmi_evaluate_method(const char *guid_string, u8 instance,
if (!(block->flags & ACPI_WMI_METHOD))
return AE_BAD_DATA;
- if (block->instance_count < instance)
+ if (block->instance_count <= instance)
return AE_BAD_PARAMETER;
input.count = 2;
@@ -250,7 +250,7 @@ struct acpi_buffer *out)
block = &wblock->gblock;
handle = wblock->handle;
- if (block->instance_count < instance)
+ if (block->instance_count <= instance)
return AE_BAD_PARAMETER;
/* Check GUID is a data block */
@@ -323,7 +323,7 @@ acpi_status wmi_set_block(const char *guid_string, u8 instance,
block = &wblock->gblock;
handle = wblock->handle;
- if (block->instance_count < instance)
+ if (block->instance_count <= instance)
return AE_BAD_PARAMETER;
/* Check GUID is a data block */
--
1.7.9.5
next reply other threads:[~2017-05-27 11:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-27 11:55 Pali Rohár [this message]
2017-06-10 19:15 ` [PATCH] RFC: platform/x86: wmi: Fix check for method instance number Pali Rohár
2017-06-13 16:49 ` Darren Hart
2017-06-13 18:04 ` Pali Rohár
2017-06-13 18:42 ` Darren Hart
2017-06-14 15:46 ` Pali Rohár
2017-06-14 20:39 ` Darren Hart
2017-06-15 13:59 ` Pali Rohár
2017-06-15 15:16 ` Mario.Limonciello
2017-06-16 16:33 ` Mario.Limonciello
2017-06-17 16:34 ` Pali Rohár
2017-06-21 21:52 ` Mario.Limonciello
2017-06-22 7:33 ` Pali Rohár
2017-06-17 16:47 ` Pali Rohár
2017-06-19 15:02 ` joeyli
2017-07-05 9:51 ` Pali Rohár
2017-07-05 19:30 ` David Airlie
2017-07-05 20:24 ` Pali Rohár
2017-08-06 15:35 ` Pali Rohár
2017-08-06 16:10 ` Andy Shevchenko
2017-08-06 20:21 ` Pali Rohár
2017-08-06 15:42 ` Pali Rohár
2017-08-06 16:18 ` Hans de Goede
2017-08-06 20:16 ` Pali Rohár
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=1495886134-8276-1-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/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).