GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-14 18:49:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/x86: surface3-wmi: Balance locking on error path

Browse source 
There is a possibility that lock will be left acquired.
Consolidate error path under out_free_unlock label.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Andy Shevchenko 2016-12-15 03:10:02 +02:00 • committed by Darren Hart
parent 957ae50981
commit 83da6b5991
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/platform/x86/surface3-wmi.c
View file

@ -60,10 +60,10 @@ static DEFINE_MUTEX(s3_wmi_lock);
static int s3_wmi_query_block(const char *guid, int instance, int *ret) static int s3_wmi_query_block(const char *guid, int instance, int *ret)
{ {
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
acpi_status status; acpi_status status;
union acpi_object *obj; union acpi_object *obj;
int error = 0;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
mutex_lock(&s3_wmi_lock); mutex_lock(&s3_wmi_lock);
status = wmi_query_block(guid, instance, &output); 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->type == ACPI_TYPE_BUFFER ?
obj->buffer.length : 0); obj->buffer.length : 0);
} }
kfree(obj); error = -EINVAL;
return -EINVAL; goto out_free_unlock;
} }
*ret = obj->integer.value; *ret = obj->integer.value;
out_free_unlock:
kfree(obj); kfree(obj);
mutex_unlock(&s3_wmi_lock); mutex_unlock(&s3_wmi_lock);
return 0; return error;
} }
static inline int s3_wmi_query_lid(int *ret) static inline int s3_wmi_query_lid(int *ret)