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>

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 54da66dc7d16c033db21664606a0fe7efc576535..7a1c2db1826be183f0c8803772e4b048a6589bbb 100644 (file)
--- 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);