lkml.org 
[lkml]   [2017]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4/4] platform/x86: wmi: Fix check for method instance number
On Sat, Aug 12, 2017 at 09:44:18AM +0200, Pali Rohár wrote:
> 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>

This is correct per the WMI specification. Pali, now that Andy has
applied 1-3 of this series, is that all the required driver updates?

Reviewed-by: Darren Hart (VMware) <dvhart@infradead.org>


> ---
> 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
>
>

--
Darren Hart
VMware Open Source Technology Center

\
 
 \ /
  Last update: 2017-08-17 17:24    [W:0.125 / U:1.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site