X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fscsi%2Fscsi_common.c;fp=kernel%2Fdrivers%2Fscsi%2Fscsi_common.c;h=ce79de822e461b37050ca6435bd91f5ed7bb55b7;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=c126966130ab792b5dac44ab4a96f4c272debe66;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/drivers/scsi/scsi_common.c b/kernel/drivers/scsi/scsi_common.c
index c12696613..ce79de822 100644
--- a/kernel/drivers/scsi/scsi_common.c
+++ b/kernel/drivers/scsi/scsi_common.c
@@ -278,8 +278,16 @@ int scsi_set_sense_information(u8 *buf, int buf_len, u64 info)
 		ucp[3] = 0;
 		put_unaligned_be64(info, &ucp[4]);
 	} else if ((buf[0] & 0x7f) == 0x70) {
-		buf[0] |= 0x80;
-		put_unaligned_be64(info, &buf[3]);
+		/*
+		 * 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;
+		else
+			buf[0] &= 0x7f;
+		put_unaligned_be32((u32)info, &buf[3]);
 	}
 
 	return 0;