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

Groups > linux.kernel > #1542548

Re: [PATCH 1/1] platform/x86: surface3-wmi: Balance locking on error path

Show all headers | View raw

On Dec 15 2016 or thereabouts, Andy Shevchenko wrote:
> There is a possibility that lock will be left acquired.
> Consolidate error path under out_free_unlock label.
> 
> Reported-by: kbuild test robot <lkp@intel.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

With Darren's remarks, the patch is:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Sorry for missing this out in the first place.

Cheers,
Benjamin

> ---
>  drivers/platform/x86/surface3-wmi.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c
> index 5553b2b85e0a..ed7a3b77a0cc 100644
> --- a/drivers/platform/x86/surface3-wmi.c
> +++ b/drivers/platform/x86/surface3-wmi.c
> @@ -60,10 +60,10 @@ static DEFINE_MUTEX(s3_wmi_lock);
>  
>  static int s3_wmi_query_block(const char *guid, int instance, int *ret)
>  {
> +	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
>  	acpi_status status;
>  	union acpi_object *obj;
> -
> -	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
> +	int error = 0;
>  
>  	mutex_lock(&s3_wmi_lock);
>  	status = wmi_query_block(guid, instance, &output);
> @@ -77,13 +77,14 @@ static int s3_wmi_query_block(const char *guid, int instance, int *ret)
>  			       obj->type == ACPI_TYPE_BUFFER ?
>  						obj->buffer.length : 0);
>  		}
> -		kfree(obj);
> -		return -EINVAL;
> +		error = -EINVAL;
> +		goto out_free_unlock;
>  	}
>  	*ret = obj->integer.value;
> +out_free_unlock:
>  	kfree(obj);
>  	mutex_unlock(&s3_wmi_lock);
> -	return 0;
> +	return error;
>  }
>  
>  static inline int s3_wmi_query_lid(int *ret)
> -- 
> 2.11.0
> 

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

Thread

[PATCH 1/1] platform/x86: surface3-wmi: Balance locking on error path Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-12-15 02:40 +0100
  Re: [PATCH 1/1] platform/x86: surface3-wmi: Balance locking on error  path Darren Hart <dvhart@infradead.org> - 2016-12-15 07:40 +0100
  Re: [PATCH 1/1] platform/x86: surface3-wmi: Balance locking on error  path Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-12-15 09:20 +0100

csiph-web