d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r287866: Fix fixed sense writing when passed more data then it can fit.

Browse Source
This commit is contained in:
mav 2015-09-23 05:14:48 +00:00
parent 0e2b30291c
commit 523b7f48b9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/cam/scsi/scsi_all.c
View File

@ -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.