| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Thu, 18 Jan 2018 14:16:38 +0100 |
| Subject: scsi: fas216: fix sense buffer initialization |
| |
| commit 96d5eaa9bb74d299508d811d865c2c41b38b0301 upstream. |
| |
| While testing with the ARM specific memset() macro removed, I ran into a |
| compiler warning that shows an old bug: |
| |
| drivers/scsi/arm/fas216.c: In function 'fas216_rq_sns_done': |
| drivers/scsi/arm/fas216.c:2014:40: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess] |
| |
| It turns out that the definition of the scsi_cmd structure changed back |
| in linux-2.6.25, so now we clear only four bytes (sizeof(pointer)) |
| instead of 96 (SCSI_SENSE_BUFFERSIZE). I did not check whether we |
| actually need to initialize the buffer here, but it's clear that if we |
| do it, we should use the correct size. |
| |
| Fixes: de25deb18016 ("[SCSI] use dynamically allocated sense buffer") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/scsi/arm/fas216.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/arm/fas216.c |
| +++ b/drivers/scsi/arm/fas216.c |
| @@ -2009,7 +2009,7 @@ static void fas216_rq_sns_done(FAS216_In |
| * have valid data in the sense buffer that could |
| * confuse the higher levels. |
| */ |
| - memset(SCpnt->sense_buffer, 0, sizeof(SCpnt->sense_buffer)); |
| + memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); |
| //printk("scsi%d.%c: sense buffer: ", info->host->host_no, '0' + SCpnt->device->id); |
| //{ int i; for (i = 0; i < 32; i++) printk("%02x ", SCpnt->sense_buffer[i]); printk("\n"); } |
| /* |
