1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index a43b9ec3aefd..7757e558d523 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -654,6 +654,19 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
          * short INQUIRY), an abort here prevents any further use of the
          * device, including spin up.
          *
+         * On the whole, the best approach seems to be to assume the first
+         * 36 bytes are valid no matter what the device says.  That's
+         * better than copying < 36 bytes to the inquiry-result buffer
+         * and displaying garbage for the Vendor, Product, or Revision
+         * strings.
+         */
+        if (sdev->inquiry_len < 36) {
+                printk(KERN_INFO "scsi scan: INQUIRY result too short (%d),"
+                                " using 36\n", sdev->inquiry_len);
+                sdev->inquiry_len = 36;
+        }
+
+        /*
          * Related to the above issue:
          *
          * XXX Devices (disk or all?) should be sent a TEST UNIT READY,