diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2015-03-18 12:29:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-25 11:53:54 +0100 |
| commit | f2eddbc9f1a466329c68f3b75e89cfacd2792365 (patch) | |
| tree | 443414bfe8ab3fe1dcb1cac51d0607a405e54c36 /drivers/hv/channel.c | |
| parent | b4affbbb7217e440f80c922b2b304795758d40bb (diff) | |
| download | linux-f2eddbc9f1a466329c68f3b75e89cfacd2792365.tar.bz2 | |
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: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv/channel.c')
| -rw-r--r-- | drivers/hv/channel.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index da53180f5eb4..2c8206d820f2 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -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; } |