projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7d6840
)
scsi: sd: Fix sd_do_mode_sense() buffer length handling
author
Damien Le Moal
<damien.lemoal@wdc.com>
Fri, 20 Aug 2021 07:02:55 +0000
(16:02 +0900)
committer
Martin K. Petersen
<martin.petersen@oracle.com>
Wed, 29 Sep 2021 04:10:57 +0000
(
00:10
-0400)
For devices that explicitly asked for MODE SENSE(10) use, make sure that
scsi_mode_sense() is called with a buffer of at least 8 bytes so that the
sense header fits.
Link:
https://lore.kernel.org/r/20210820070255.682775-4-damien.lemoal@wdc.com
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/sd.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/scsi/sd.c
b/drivers/scsi/sd.c
index cbd9999f93a6b2a08c5f625b2184a21dd8bbb407..71fa70b42c2b432c9d2064adf000a106a5ab6af1 100644
(file)
--- a/
drivers/scsi/sd.c
+++ b/
drivers/scsi/sd.c
@@
-2604,6
+2604,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);