Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40384e4b authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open() 



Correctly rollback state if the failure occurs after we have handed over
the ownership of the buffer to the host.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b057b3ad

drivers/hv/channel.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -137,7 +137,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);
@@ -153,7 +153,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)
@@ -197,6 +197,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));