Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open()
commit 40384e4bbeb9f2651fe9bffc0062d9f31ef625bf upstream. Correctly rollback state if the failure occurs after we have handed over the ownership of the buffer to the host. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a2ed2ed6fe
commit
b020a4676d
|
@ -169,7 +169,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!open_info) {
|
if (!open_info) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto error0;
|
goto error_gpadl;
|
||||||
}
|
}
|
||||||
|
|
||||||
init_completion(&open_info->waitevent);
|
init_completion(&open_info->waitevent);
|
||||||
|
@ -185,7 +185,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
|
||||||
|
|
||||||
if (userdatalen > MAX_USER_DEFINED_BYTES) {
|
if (userdatalen > MAX_USER_DEFINED_BYTES) {
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
goto error0;
|
goto error_gpadl;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (userdatalen)
|
if (userdatalen)
|
||||||
|
@ -226,6 +226,9 @@ error1:
|
||||||
list_del(&open_info->msglistentry);
|
list_del(&open_info->msglistentry);
|
||||||
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
|
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
|
||||||
|
|
||||||
|
error_gpadl:
|
||||||
|
vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle);
|
||||||
|
|
||||||
error0:
|
error0:
|
||||||
free_pages((unsigned long)out,
|
free_pages((unsigned long)out,
|
||||||
get_order(send_ringbuffer_size + recv_ringbuffer_size));
|
get_order(send_ringbuffer_size + recv_ringbuffer_size));
|
||||||
|
|
Loading…
Reference in New Issue