Commit ba083116 authored Mar 18, 2016 by Hannes Reinecke Committed by Martin K. Petersen Mar 18, 2016

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: a1524f22 ("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>

parent c80fa12e

drivers/scsi/scsi_common.c

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -278,8 +278,16 @@ int scsi_set_sense_information(u8 *buf, int buf_len, u64 info)
	ucp[3] = 0;		ucp[3] = 0;
	put_unaligned_be64(info, &ucp[4]);		put_unaligned_be64(info, &ucp[4]);
	} else if ((buf[0] & 0x7f) == 0x70) {		} else if ((buf[0] & 0x7f) == 0x70) {
			/*
			* Only set the 'VALID' bit if we can represent the value
			* correctly; otherwise just fill out the lower bytes and
			* clear the 'VALID' flag.
			*/
			if (info <= 0xffffffffUL)
	buf[0] \|= 0x80;		buf[0] \|= 0x80;
	put_unaligned_be64(info, &buf[3]);		else
			buf[0] &= 0x7f;
			put_unaligned_be32((u32)info, &buf[3]);
	}		}

	return 0;		return 0;

Admin message