Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1710191

[PATCH 4/4] platform/x86: wmi: Fix check for method instance number

From Pali Rohár <pali.rohar@gmail.com>
Newsgroups linux.kernel
Subject [PATCH 4/4] platform/x86: wmi: Fix check for method instance number
Date 2017-08-12 09:50 +0200
Message-ID <udzlf-69b-3@gated-at.bofh.it> (permalink)
References <udzlf-69b-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View 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>
---
 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

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

[PATCH 4/4] platform/x86: wmi: Fix check for method instance number Pali Rohár <pali.rohar@gmail.com> - 2017-08-12 09:50 +0200
  Re: [PATCH 4/4] platform/x86: wmi: Fix check for method instance  number Darren Hart <dvhart@infradead.org> - 2017-08-17 17:30 +0200
    Re: [PATCH 4/4] platform/x86: wmi: Fix check for method instance  number Pali Rohár <pali.rohar@gmail.com> - 2017-08-17 23:20 +0200
      Re: [PATCH 4/4] platform/x86: wmi: Fix check for method instance  number Darren Hart <dvhart@infradead.org> - 2017-08-17 23:40 +0200
    Re: [PATCH 4/4] platform/x86: wmi: Fix check for method instance number Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-08-18 14:30 +0200

csiph-web