redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
K. Y. Srinivasan 2015-03-18 12:29:27 -07:00 committed by Greg Kroah-Hartman
parent b4affbbb72
commit f2eddbc9f1
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/hv/channel.c
View file

@ -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;
}