DF-1030 / fix.diff
diff --git a/sys/bus/cam/scsi/scsi_ch.c b/sys/bus/cam/scsi/scsi_ch.c --- a/sys/bus/cam/scsi/scsi_ch.c +++ b/sys/bus/cam/scsi/scsi_ch.c @@ -1298,7 +1298,7 @@ } memcpy(ssvtp.vitf, csvr->csvr_voltag.cv_volid, - min(strlen(csvr->csvr_voltag.cv_volid), sizeof(ssvtp.vitf))); + min(strnlen((const char *)csvr->csvr_voltag.cv_volid, sizeof(csvr->csvr_voltag.cv_volid)), sizeof(ssvtp.vitf))); scsi_ulto2b(csvr->csvr_voltag.cv_serial, ssvtp.minvsn); ccb = cam_periph_getccb(periph, /*priority*/ 1); |