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

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

Drivers: hv: vmbus: Fix a bug in rescind processing in vmbus_close_internal() 



When a channel has been rescinded, the close operation is a noop.
Restructure the code so we deal with the rescind condition after
we properly cleanup the channel. I would like to thank
Dexuan Cui <decui@microsoft.com> for observing this problem.
The current code leaks memory when the channel is rescinded.

The current char-next branch is broken and this patch fixes
the bug.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b4affbbb

drivers/hv/channel.c

+6 −9
Original line number Diff line number Diff line
@@ -501,15 +501,6 @@ static int vmbus_close_internal(struct vmbus_channel *channel) 
		put_cpu();

	}



	/*

	 * If the channel has been rescinded; process device removal.

	 */

	if (channel->rescind) {

		hv_process_channel_removal(channel,

					   channel->offermsg.child_relid);

		return 0;

	}



	/* Send a closing message */



	msg = &channel->close_msg.msg;
@@ -549,6 +540,12 @@ static int vmbus_close_internal(struct vmbus_channel *channel) 
	free_pages((unsigned long)channel->ringbuffer_pages,

		get_order(channel->ringbuffer_pagecount * PAGE_SIZE));



	/*

	 * If the channel has been rescinded; process device removal.

	 */

	if (channel->rescind)

		hv_process_channel_removal(channel,

					   channel->offermsg.child_relid);

	return ret;

}