diff options
author | Tianyu Lan <Tianyu.Lan@microsoft.com> | 2020-04-06 08:53:27 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-23 10:30:16 +0200 |
commit | 89b0b47a6fb86c268e662046f31777f6e7c557d7 (patch) | |
tree | d277a1e6e39740bde5971811336c799ef4864f30 /drivers/hv | |
parent | 5e059fc0f054309036d3f612bc8b0a502ca58545 (diff) | |
download | linux-stable-89b0b47a6fb86c268e662046f31777f6e7c557d7.tar.gz linux-stable-89b0b47a6fb86c268e662046f31777f6e7c557d7.tar.bz2 linux-stable-89b0b47a6fb86c268e662046f31777f6e7c557d7.zip |
x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump
[ Upstream commit 7f11a2cc10a4ae3a70e2c73361f4a9a33503539b ]
If kmsg_dump_register() fails, hv_panic_page will not be used
anywhere. So free and reset it.
Fixes: 81b18bce48af ("Drivers: HV: Send one page worth of kmsg dump over Hyper-V during panic")
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
Link: https://lore.kernel.org/r/20200406155331.2105-3-Tianyu.Lan@microsoft.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/hv')
-rw-r--r-- | drivers/hv/vmbus_drv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 5ff7c1708d0e..dd6d18d918a4 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1222,9 +1222,13 @@ static int vmbus_bus_init(void) hv_panic_page = (void *)get_zeroed_page(GFP_KERNEL); if (hv_panic_page) { ret = kmsg_dump_register(&hv_kmsg_dumper); - if (ret) + if (ret) { pr_err("Hyper-V: kmsg dump register " "error 0x%x\n", ret); + free_page( + (unsigned long)hv_panic_page); + hv_panic_page = NULL; + } } else pr_err("Hyper-V: panic message page memory " "allocation failed"); @@ -1252,7 +1256,6 @@ err_alloc: hv_remove_vmbus_irq(); bus_unregister(&hv_bus); - free_page((unsigned long)hv_panic_page); unregister_sysctl_table(hv_ctl_table_hdr); hv_ctl_table_hdr = NULL; return ret; |