Index: sys/cam/ctl/ctl_backend_block.c
===================================================================
--- sys/cam/ctl/ctl_backend_block.c
+++ sys/cam/ctl/ctl_backend_block.c
@@ -2312,27 +2312,27 @@
 	if ((params->flags & CTL_LUN_FLAG_SERIAL_NUM) == 0) {
 		snprintf(tmpstr, sizeof(tmpstr), "MYSERIAL%04d",
 			 softc->num_luns);
-		strncpy((char *)cbe_lun->serial_num, tmpstr,
+		strlcpy((char *)cbe_lun->serial_num, tmpstr,
 			MIN(sizeof(cbe_lun->serial_num), sizeof(tmpstr)));
 
 		/* Tell the user what we used for a serial number */
-		strncpy((char *)params->serial_num, tmpstr,
+		strlcpy((char *)params->serial_num, tmpstr,
 			MIN(sizeof(params->serial_num), sizeof(tmpstr)));
 	} else { 
-		strncpy((char *)cbe_lun->serial_num, params->serial_num,
+		strlcpy((char *)cbe_lun->serial_num, params->serial_num,
 			MIN(sizeof(cbe_lun->serial_num),
 			sizeof(params->serial_num)));
 	}
 	if ((params->flags & CTL_LUN_FLAG_DEVID) == 0) {
 		snprintf(tmpstr, sizeof(tmpstr), "MYDEVID%04d", softc->num_luns);
-		strncpy((char *)cbe_lun->device_id, tmpstr,
+		strlcpy((char *)cbe_lun->device_id, tmpstr,
 			MIN(sizeof(cbe_lun->device_id), sizeof(tmpstr)));
 
 		/* Tell the user what we used for a device ID */
-		strncpy((char *)params->device_id, tmpstr,
+		strlcpy((char *)params->device_id, tmpstr,
 			MIN(sizeof(params->device_id), sizeof(tmpstr)));
 	} else {
-		strncpy((char *)cbe_lun->device_id, params->device_id,
+		strlcpy((char *)cbe_lun->device_id, params->device_id,
 			MIN(sizeof(cbe_lun->device_id),
 			    sizeof(params->device_id)));
 	}