From 523b7f48b90a30537edbbcf66fc1c25fe24373e9 Mon Sep 17 00:00:00 2001 From: mav Date: Wed, 23 Sep 2015 05:14:48 +0000 Subject: MFC r287866: Fix fixed sense writing when passed more data then it can fit. --- sys/cam/scsi/scsi_all.c | 10 ++++++---- 1 file 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. -- cgit v1.1