Index: sys/cam/cam_xpt.c
===================================================================
--- sys/cam/cam_xpt.c
+++ sys/cam/cam_xpt.c
@@ -1756,7 +1756,7 @@
 		cdm->matches[j].result.bus_result.bus_id = bus->sim->bus_id;
 		cdm->matches[j].result.bus_result.unit_number =
 			bus->sim->unit_number;
-		strncpy(cdm->matches[j].result.bus_result.dev_name,
+		strlcpy(cdm->matches[j].result.bus_result.dev_name,
 			bus->sim->sim_name, DEV_IDLEN);
 	}
 
@@ -2019,7 +2019,7 @@
 			periph->path->device->lun_id;
 		cdm->matches[j].result.periph_result.unit_number =
 			periph->unit_number;
-		strncpy(cdm->matches[j].result.periph_result.periph_name,
+		strlcpy(cdm->matches[j].result.periph_result.periph_name,
 			periph->periph_name, DEV_IDLEN);
 	}
 
@@ -2191,7 +2191,7 @@
 
 		cdm->matches[j].result.periph_result.unit_number =
 			periph->unit_number;
-		strncpy(cdm->matches[j].result.periph_result.periph_name,
+		strlcpy(cdm->matches[j].result.periph_result.periph_name,
 			periph->periph_name, DEV_IDLEN);
 	}
 
@@ -2905,7 +2905,7 @@
 		     (nperiph != NULL) && (i <= cgdl->index);
 		     nperiph = SLIST_NEXT(nperiph, periph_links), i++) {
 			if (i == cgdl->index) {
-				strncpy(cgdl->periph_name,
+				strlcpy(cgdl->periph_name,
 					nperiph->periph_name,
 					DEV_IDLEN);
 				cgdl->unit_number = nperiph->unit_number;