Commit ec97e112 authored by Dexuan Cui's avatar Dexuan Cui Committed by Wei Liu
Browse files

Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails 



Commit 57208632 ("Drivers: hv: vmbus: Cleanup synic memory free path")
says "Any memory allocations that succeeded will be freed when the caller
cleans up by calling hv_synic_free()", but if the get_zeroed_page() in
hv_synic_alloc() fails, currently hv_synic_free() is not really called
in vmbus_bus_init(), consequently there will be a memory leak, e.g.
hv_context.hv_numa_map is not freed in the error path. Fix this by
updating the goto labels.

Cc: stable@kernel.org
Signed-off-by: default avatarDexuan Cui <decui@microsoft.com>
Fixes: 4df4cb9e ("x86/hyperv: Initialize clockevents earlier in CPU onlining")
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20230504224155.10484-1-decui@microsoft.com


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent cb6aeeb6

drivers/hv/vmbus_drv.c

+2 −3
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static int vmbus_bus_init(void) 
	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "hyperv/vmbus:online",

				hv_synic_init, hv_synic_cleanup);

	if (ret < 0)

		goto err_cpuhp;

		goto err_alloc;

	hyperv_cpuhp_online = ret;



	ret = vmbus_connect();
@@ -1392,9 +1392,8 @@ static int vmbus_bus_init(void) 


err_connect:

	cpuhp_remove_state(hyperv_cpuhp_online);

err_cpuhp:

	hv_synic_free();

err_alloc:

	hv_synic_free();

	if (vmbus_irq == -1) {

		hv_remove_vmbus_handler();

	} else {