From: Sagi Grimberg <sagig@mellanox.com>
Date: Wed, 15 Jul 2015 07:55:36 +0000 (+0300)
Subject: scsi: Fix wrong additional sense length in descriptor format
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12306b425d0dbab7b60f54e02d67cf3dfae494d1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

scsi: Fix wrong additional sense length in descriptor format

The sense header additional sense length should be the accumulated
size of all the descriptors. Information descriptor size is 12 bytes.
When setting the additional sense length we should add 0xc instead of
0xa.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
---

diff --git a/drivers/scsi/scsi_common.c b/drivers/scsi/scsi_common.c
index 41432c10dda2..ee6bdf43a8ea 100644
--- a/drivers/scsi/scsi_common.c
+++ b/drivers/scsi/scsi_common.c
@@ -260,7 +260,7 @@ void scsi_set_sense_information(u8 *buf, u64 info)
 		len = buf[7];
 		ucp = (char *)scsi_sense_desc_find(buf, len + 8, 0);
 		if (!ucp) {
-			buf[7] = len + 0xa;
+			buf[7] = len + 0xc;
 			ucp = buf + 8 + len;
 		}
 		ucp[0] = 0;