Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1206848

[PATCH RESEND V2 7/7] scsi: storvsc: Set the error code correctly in failure conditions

Show all headers | View raw

In the function storvsc_channel_init(), error code was not getting
set correctly in some of the failure cases. Fix this issue.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/scsi/storvsc_drv.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 021cbdf..aac8297 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -960,8 +960,10 @@ static int storvsc_channel_init(struct hv_device *device)
 	}
 
 	if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
-	    vstor_packet->status != 0)
+	    vstor_packet->status != 0) {
+		ret = -EINVAL;
 		goto cleanup;
+	}
 
 
 	for (i = 0; i < VMSTOR_NUM_PROTOCOLS; i++) {
@@ -1040,8 +1042,10 @@ static int storvsc_channel_init(struct hv_device *device)
 	}
 
 	if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
-	    vstor_packet->status != 0)
+	    vstor_packet->status != 0) {
+		ret = -EINVAL;
 		goto cleanup;
+	}
 
 	/*
 	 * Check to see if multi-channel support is there.
@@ -1078,8 +1082,10 @@ static int storvsc_channel_init(struct hv_device *device)
 	}
 
 	if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
-	    vstor_packet->status != 0)
+	    vstor_packet->status != 0) {
+		ret = -EINVAL;
 		goto cleanup;
+	}
 
 	if (process_sub_channels)
 		handle_multichannel_storage(device, max_chns);
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RESEND V2 1/7] scsi: storvsc: Rather than look for sets of specific protocol versions, make decisions based on ranges. "K. Y. Srinivasan" <kys@microsoft.com> - 2015-08-13 16:20 +0200
  [PATCH RESEND V2 2/7] scsi: storvsc: Use a single value to track protocol versions "K. Y. Srinivasan" <kys@microsoft.com> - 2015-08-13 16:20 +0200
  [PATCH RESEND V2 6/7] scsi: storvsc: Allow write_same when host is windows 10 "K. Y. Srinivasan" <kys@microsoft.com> - 2015-08-13 16:20 +0200
  [PATCH RESEND V2 7/7] scsi: storvsc: Set the error code correctly in failure conditions "K. Y. Srinivasan" <kys@microsoft.com> - 2015-08-13 16:20 +0200
  [PATCH RESEND V2 5/7] scsi: storvsc: use storage protocol version to determine storage capabilities "K. Y. Srinivasan" <kys@microsoft.com> - 2015-08-13 16:20 +0200
  [PATCH RESEND V2 4/7] scsi: storvsc: use correct defaults for values determined by protocol negotiation "K. Y. Srinivasan" <kys@microsoft.com> - 2015-08-13 16:30 +0200

csiph-web