diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5385805e06a829ad8176420ab44d36e18c0fcf77..5958914829868ea7ae9c41025ff5ea54067aa863 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2657,6 +2657,13 @@ sd_do_mode_sense(struct scsi_disk *sdkp, int dbd, int modepage,
 		 unsigned char *buffer, int len, struct scsi_mode_data *data,
 		 struct scsi_sense_hdr *sshdr)
 {
+	/*
+	 * If we must use MODE SENSE(10), make sure that the buffer length
+	 * is at least 8 bytes so that the mode sense header fits.
+	 */
+	if (sdkp->device->use_10_for_ms && len < 8)
+		len = 8;
+
 	return scsi_mode_sense(sdkp->device, dbd, modepage, buffer, len,
 			       SD_TIMEOUT, sdkp->max_retries, data,
 			       sshdr);