Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi_common: do not clobber fixed sense information

For fixed sense the information field is 32 bits, to we need to truncate
the information field to avoid clobbering the sense code.

Fixes: a1524f226a02 ("libata-eh: Set 'information' field for autosense")
Cc: <stable@vger.kernel.org> #v4.1+
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Hannes Reinecke and committed by
Martin K. Petersen
ba083116 c80fa12e

+10 -2
+10 -2
drivers/scsi/scsi_common.c
··· 278 278 ucp[3] = 0; 279 279 put_unaligned_be64(info, &ucp[4]); 280 280 } else if ((buf[0] & 0x7f) == 0x70) { 281 - buf[0] |= 0x80; 282 - put_unaligned_be64(info, &buf[3]); 281 + /* 282 + * Only set the 'VALID' bit if we can represent the value 283 + * correctly; otherwise just fill out the lower bytes and 284 + * clear the 'VALID' flag. 285 + */ 286 + if (info <= 0xffffffffUL) 287 + buf[0] |= 0x80; 288 + else 289 + buf[0] &= 0x7f; 290 + put_unaligned_be32((u32)info, &buf[3]); 283 291 } 284 292 285 293 return 0;