Author: mav
Date: Wed Sep 10 06:25:18 2014
New Revision: 271352
URL: http://svnweb.freebsd.org/changeset/base/271352
Log:
Fix minor buffer overflow reported by Coverity.
CID: 1006781
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c Wed Sep 10 05:52:30 2014 (r271351)
+++ head/sys/cam/ctl/ctl.c Wed Sep 10 06:25:18 2014 (r271352)
@@ -10584,24 +10584,28 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio
*/
if (lun == NULL || (val = ctl_get_opt(&lun->be_lun->options,
"vendor")) == NULL) {
- strcpy(inq_ptr->vendor, CTL_VENDOR);
+ strncpy(inq_ptr->vendor, CTL_VENDOR, sizeof(inq_ptr->vendor));
} else {
memset(inq_ptr->vendor, ' ', sizeof(inq_ptr->vendor));
strncpy(inq_ptr->vendor, val,
min(sizeof(inq_ptr->vendor), strlen(val)));
}
if (lun == NULL) {
- strcpy(inq_ptr->product, CTL_DIRECT_PRODUCT);
+ strncpy(inq_ptr->product, CTL_DIRECT_PRODUCT,
+ sizeof(inq_ptr->product));
} else if ((val = ctl_get_opt(&lun->be_lun->options, "product")) ==
NULL) {
switch (lun->be_lun->lun_type) {
case T_DIRECT:
- strcpy(inq_ptr->product, CTL_DIRECT_PRODUCT);
+ strncpy(inq_ptr->product, CTL_DIRECT_PRODUCT,
+ sizeof(inq_ptr->product));
break;
case T_PROCESSOR:
- strcpy(inq_ptr->product, CTL_PROCESSOR_PRODUCT);
+ strncpy(inq_ptr->product, CTL_PROCESSOR_PRODUCT,
+ sizeof(inq_ptr->product));
break;
default:
- strcpy(inq_ptr->product, CTL_UNKNOWN_PRODUCT);
+ strncpy(inq_ptr->product, CTL_UNKNOWN_PRODUCT,
+ sizeof(inq_ptr->product));
break;
}
} else {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
