From: "Pali Rohár" <pali.rohar@gmail.com>
To: Corentin Chary <corentin.chary@gmail.com>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
Cc: acpi4asus-user@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, "Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH 4/4] platform/x86: wmi: Fix check for method instance number
Date: Sat, 12 Aug 2017 09:44:18 +0200 [thread overview]
Message-ID: <1502523858-25716-5-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1502523858-25716-1-git-send-email-pali.rohar@gmail.com>
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>
---
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 e32ba57..0765b17 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -218,7 +218,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;
@@ -265,7 +265,7 @@ static acpi_status __query_block(struct wmi_block *wblock, u8 instance,
block = &wblock->gblock;
handle = wblock->acpi_device->handle;
- if (block->instance_count < instance)
+ if (block->instance_count <= instance)
return AE_BAD_PARAMETER;
/* Check GUID is a data block */
@@ -392,7 +392,7 @@ acpi_status wmi_set_block(const char *guid_string, u8 instance,
block = &wblock->gblock;
handle = wblock->acpi_device->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 prev parent reply other threads:[~2017-08-12 7:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-12 7:44 [PATCH 0/4] platform/x86: " Pali Rohár
2017-08-12 7:44 ` [PATCH 1/4] platform/x86: mxm-wmi: Evaluate wmi method with instance number 0x0 Pali Rohár
2017-08-12 7:44 ` [PATCH 2/4] platform/x86: asus-wmi: " Pali Rohár
2017-08-12 7:44 ` [PATCH 3/4] platform/x86: peaq-wmi: " Pali Rohár
2017-08-12 20:12 ` Hans de Goede
2017-08-12 7:44 ` Pali Rohár [this message]
2017-08-17 15:24 ` [PATCH 4/4] platform/x86: wmi: Fix check for method instance number Darren Hart
2017-08-17 21:13 ` Pali Rohár
2017-08-17 21:36 ` Darren Hart
2017-08-18 12:20 ` Andy Shevchenko
2017-08-13 12:54 ` [PATCH 0/4] platform/x86: " Andy Shevchenko
2017-08-17 15:25 ` Darren Hart
2017-08-17 17:31 ` Andy Shevchenko
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=1502523858-25716-5-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=andy@infradead.org \
--cc=corentin.chary@gmail.com \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.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
Powered by JetHome