diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2015-05-07 02:47:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-24 21:19:00 +0200 |
| commit | ffc151f3c83c25ec06d5ad13a78d0fc066c7167e (patch) | |
| tree | 6d3fd020c5a7e7d3d73879c1134c1ad09c9e44f4 /drivers/hv | |
| parent | Drivers: hv: vmbus: Implement the protocol for tearing down vmbus state (diff) | |
| download | linux-ffc151f3c83c25ec06d5ad13a78d0fc066c7167e.tar.xz linux-ffc151f3c83c25ec06d5ad13a78d0fc066c7167e.zip | |
Drivers: hv: vmbus: do cleanup on all vmbus_open() failure paths
In case there was an error reported in the response to the CHANNELMSG_OPENCHANNEL
call we need to do the cleanup as a vmbus_open() user won't be doing it after
receiving an error. The cleanup should be done on all failure paths. We also need
to avoid returning open_info->response.open_result.status as the return value as
all other errors we return from vmbus_open() are -EXXX and vmbus_open() callers
are not supposed to analyze host error codes.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/channel.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index 54da66dc7d16..7a1c2db1826b 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -178,19 +178,18 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, goto error1; } - - if (open_info->response.open_result.status) - err = open_info->response.open_result.status; - spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); list_del(&open_info->msglistentry); spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); - if (err == 0) - newchannel->state = CHANNEL_OPENED_STATE; + if (open_info->response.open_result.status) { + err = -EAGAIN; + goto error_gpadl; + } + newchannel->state = CHANNEL_OPENED_STATE; kfree(open_info); - return err; + return 0; error1: spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); |