2017-07-21 21:48:17

by Alexey Khoroshilov

Subject: [PATCH] platform/x86: wmi: Fix error handling in acpi_wmi_init()

The order of resource deallocations is messed up in acpi_wmi_init().
It should be vice versa.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
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 1a764e311e11..e32ba575e8d9 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1252,12 +1252,12 @@ static int __init acpi_wmi_init(void)

return 0;

-err_unreg_class:
- class_unregister(&wmi_bus_class);
-
err_unreg_bus:
bus_unregister(&wmi_bus_type);

+err_unreg_class:
+ class_unregister(&wmi_bus_class);
+
return error;
}

--
2.7.4

2017-07-21 23:43:06

by Darren Hart

Subject: Re: [PATCH] platform/x86: wmi: Fix error handling in acpi_wmi_init()

On Sat, Jul 22, 2017 at 12:48:06AM +0300, Alexey Khoroshilov wrote:
> The order of resource deallocations is messed up in acpi_wmi_init().
> It should be vice versa.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>

Eeek. Thank you. Applied to fixes for 4.13.X.

--
Darren Hart
VMware Open Source Technology Center