diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 16:33:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 16:33:42 -0700 |
| commit | 2e99f3a12b20ab3afad0e042cc0bdd0ee855dca0 (patch) | |
| tree | 611bd8acc0c14137a0e15835df52be2249ae3b35 /drivers/acpi/acpica/utosi.c | |
| parent | fc72053bb497e3054d6e4d13ab425fc2311442d4 (diff) | |
| parent | 04a29a15520463e072b1a98d8989f04233ee4a7e (diff) | |
Merge tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPICA fixes from Rafael Wysocki:
- _INI regression fix from Tomasz Nowicki.
- Fix for a possible memory leak in _OSI support routine from Jung-uk
Kim.
- Fix for a possible buffer overflow during field unit read operation
from Bob Moore.
* tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPICA: ACPICA: Fix for _INI regression
ACPICA: _OSI support: Fix possible memory leak
ACPICA: Fix possible buffer overflow during a field unit read operation
Diffstat (limited to 'drivers/acpi/acpica/utosi.c')
| -rw-r--r-- | drivers/acpi/acpica/utosi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c index b15acebb96a..7e807725c63 100644 --- a/drivers/acpi/acpica/utosi.c +++ b/drivers/acpi/acpica/utosi.c @@ -349,7 +349,8 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state) return_value = 0; status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); if (ACPI_FAILURE(status)) { - return (status); + acpi_ut_remove_reference(return_desc); + return_ACPI_STATUS(status); } /* Lookup the interface in the global _OSI list */ |