diff options
| author | mav <mav@FreeBSD.org> | 2015-09-23 05:14:48 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-09-23 05:14:48 +0000 |
| commit | 523b7f48b90a30537edbbcf66fc1c25fe24373e9 (patch) | |
| tree | 934fea8c0120d8ad4dea102afe1f3c97653e6548 | |
| parent | 0e2b30291c0e34b9f5e5d79913a83bdf7e98ea4c (diff) | |
| download | FreeBSD-src-523b7f48b90a30537edbbcf66fc1c25fe24373e9.zip FreeBSD-src-523b7f48b90a30537edbbcf66fc1c25fe24373e9.tar.gz | |
MFC r287866: Fix fixed sense writing when passed more data then it can fit.
| -rw-r--r-- | sys/cam/scsi/scsi_all.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 4013ff8..af97588 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -3803,8 +3803,6 @@ scsi_set_sense_data_va(struct scsi_sense_data *sense_data, */ sense->extra_len = 10; sense_len = (int)va_arg(ap, int); - len_to_copy = MIN(sense_len, SSD_EXTRA_MAX - - sense->extra_len); data = (uint8_t *)va_arg(ap, uint8_t *); switch (elem_type) { @@ -3822,10 +3820,14 @@ scsi_set_sense_data_va(struct scsi_sense_data *sense_data, uint8_t *data_dest; int i; - if (elem_type == SSD_ELEM_COMMAND) + if (elem_type == SSD_ELEM_COMMAND) { data_dest = &sense->cmd_spec_info[0]; - else { + len_to_copy = MIN(sense_len, + sizeof(sense->cmd_spec_info)); + } else { data_dest = &sense->info[0]; + len_to_copy = MIN(sense_len, + sizeof(sense->info)); /* * We're setting the info field, so * set the valid bit. |
