From: Sunil Muthuswamy <sunilmut@microsoft.com>
Date: Sat, 28 Jul 2018 21:58:46 +0000
Patch-mainline: v4.19-rc1
Subject: Drivers: hv: vmbus: Fix the issue with freeing up hv_ctl_table_hdr
Git-commit: 8afc06dd75c06b9d6e70e4a72fdafbd4cab8d1df
References: bsc#1107207
The check to free the Hyper-V control table header was reversed. This
fixes it.
Fixes: 81b18bce48af ("Drivers: HV: Send one page worth of kmsg dump over Hyper-V during panic")
Signed-off-by: Sunil Muthuswamy <sunilmut@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Olaf Hering <ohering@suse.de>
---
drivers/hv/vmbus_drv.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1176,11 +1176,8 @@ err_alloc:
bus_unregister(&hv_bus);
free_page((unsigned long)hv_panic_page);
- if (!hv_ctl_table_hdr) {
- unregister_sysctl_table(hv_ctl_table_hdr);
- hv_ctl_table_hdr = NULL;
- }
-
+ unregister_sysctl_table(hv_ctl_table_hdr);
+ hv_ctl_table_hdr = NULL;
return ret;
}
@@ -1891,11 +1888,8 @@ static void __exit vmbus_exit(void)
}
free_page((unsigned long)hv_panic_page);
- if (!hv_ctl_table_hdr) {
- unregister_sysctl_table(hv_ctl_table_hdr);
- hv_ctl_table_hdr = NULL;
- }
-
+ unregister_sysctl_table(hv_ctl_table_hdr);
+ hv_ctl_table_hdr = NULL;
bus_unregister(&hv_bus);
cpuhp_remove_state(hyperv_cpuhp_online);